From 9ea083db0ad9667804f30e08e1eb5cdbbfe646ea Mon Sep 17 00:00:00 2001
From: alexandre_brazil <alexandre_brazil@noreply.door43.org>
Date: Thu, 1 Nov 2018 22:02:27 -0300
Subject: [PATCH] Thu Nov 01 2018 22:02:24 GMT-0300 (Hora oficial do Brasil)

---
 front/title.txt | 6 +-----
 manifest.json   | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/front/title.txt b/front/title.txt
index 67289d4..01a4fdb 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Joshua
-=======
-Josué
->>>>>>> 31ef266077cee7cb8ed8f2a0b30ae573c86acc45
+Josué
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 23a0041..9684a2f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -36,6 +36,7 @@
 		"Alexandre Amaral"
 	],
 	"finished_chunks": [
+		"front-title",
 		"01-title",
 		"02-title",
 		"03-title",