From 496e79a90fe1a1fd0208d3cc58c0d144daa8a924 Mon Sep 17 00:00:00 2001
From: alexandre_brazil <alexandre_brazil@noreply.door43.org>
Date: Mon, 16 Jul 2018 00:07:34 -0300
Subject: [PATCH] Mon Jul 16 2018 00:07:33 GMT-0300 (Hora oficial do Brasil)

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

diff --git a/front/title.txt b/front/title.txt
index cea5fde..ac642de 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Numeros
-=======
-Numbers
->>>>>>> 939b180a24f12c63a66bc54c0feb37dee5998194
+Números
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 400165a..b712d9c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -33,7 +33,8 @@
 	],
 	"parent_draft": {},
 	"translators": [
-		"Caio Guimarães"
+		"Caio Guimarães",
+		"Alexandre Amaral"
 	],
 	"finished_chunks": []
 }
\ No newline at end of file