From 14b9c855a865e0e5685fc3e5a90b1982bf05475f Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Sat, 24 Feb 2018 09:51:53 -0300
Subject: [PATCH] Sat Feb 24 2018 09:51:52 GMT-0300 (BRT)

---
 01/01.txt     | 5 -----
 manifest.json | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/01/01.txt b/01/01.txt
index e771b84..668f6b4 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1,15 +1,10 @@
 [
 	{
-<<<<<<< HEAD
 		"title": "Os filhos de Israel foram para qual país com Jacó ?",
 		"body": "Os filhos de Israel foram para o Egito com Jacó."
 	},
 	{
 		"title": "Havia quantos descendentes de Jacó ?",
 		"body": "Todos os descendentes de Jacó eram setenta."
-=======
-		"title": "",
-		"body": ""
->>>>>>> ae3643de2ff0ecaa4275b39f09a85cd0fba230f4
 	}
 ]
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 612ea90..aaca247 100644
--- a/manifest.json
+++ b/manifest.json
@@ -38,7 +38,8 @@
 		"Gabriela A.",
 		"Helena",
 		"Felipe Garcia",
-		"USUÁRIO 01"
+		"USUÁRIO 01",
+		"Abelmon de O. Bastos"
 	],
 	"finished_chunks": [
 		"04-01",