Thu Sep 24 2020 02:03:32 GMT-0300 (E. South America Standard Time)

2020-09-24 02:03:32 -03:00 · 2020-09-24 02:03:32 -03:00 · 967ce07be1
parent 3219deb537
commit 967ce07be1
2 changed files with 2 additions and 5 deletions
--- a/front/title.txt
+++ b/front/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-1
-=======
-1 Jon
->>>>>>> bb09938bef97704ed19b55da7011bf8eb63a3b79
+1 Jon
--- a/manifest.json
+++ b/manifest.json
@ -38,6 +38,7 @@
 		"malda"
 	],
 	"finished_chunks": [
+		"front-title",
 		"01-title",
 		"01-01",
 		"01-03",