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

---
 front/title.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/front/title.txt b/front/title.txt
index 4ae6694..e767ab7 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Exodus
-=======
-Êxodo
->>>>>>> df23aa06fafabe0e0442c1910992476bbe4e549c
+Êxodo
\ No newline at end of file