From e4efdb8a016c6310d9f209943371f5434ae0b1c3 Mon Sep 17 00:00:00 2001
From: alexandre_brazil <alexandre_brazil@noreply.door43.org>
Date: Thu, 24 May 2018 21:10:24 -0300
Subject: [PATCH] Thu May 24 2018 21:10:22 GMT-0300 (Hora oficial do Brasil)

---
 01/06.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/01/06.txt b/01/06.txt
index a2fce20..bd124fc 100644
--- a/01/06.txt
+++ b/01/06.txt
@@ -4,12 +4,7 @@
 		"body": "Yahweh aprova o caminho dos justos."
 	},
 	{
-<<<<<<< HEAD
-		"title": "O que acontecerá com o caminho dos maus?",
-		"body": "O caminho dos maus perecerá."
-=======
 		"title": "O que acontecerá ao caminho dos ímpios?",
 		"body": "O caminho dos impíos perecerá."
->>>>>>> 36dc374fbfb9a431bd7d5497d1c2bc5ef714e693
 	}
 ]
\ No newline at end of file