Thu Nov 01 2018 22:02:24 GMT-0300 (Hora oficial do Brasil)

2018-11-01 22:02:27 -03:00 · 2018-11-01 22:02:27 -03:00 · 9ea083db0a
parent 1c8e3190dc
commit 9ea083db0a
2 changed files with 2 additions and 5 deletions
--- a/front/title.txt
+++ b/front/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Joshua
-=======
-Josué
->>>>>>> 31ef266077cee7cb8ed8f2a0b30ae573c86acc45
+Josué
--- a/manifest.json
+++ b/manifest.json
@ -36,6 +36,7 @@
 		"Alexandre Amaral"
 	],
 	"finished_chunks": [
+		"front-title",
 		"01-title",
 		"02-title",
 		"03-title",