Thu Mar 09 2017 16:39:13 GMT+0200 (CAT)

2017-03-09 16:39:13 +02:00 · 2017-03-09 16:39:13 +02:00 · 4ed1381f37
parent 5879b7164e
commit 4ed1381f37
2 changed files with 2 additions and 5 deletions
--- a/front/title.txt
+++ b/front/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-1 BATHESALONIKA
-=======
-batheselonika
->>>>>>> b4cd2df504038f30cf2f735428c8358e277e3f66
+1 BATHESALONIKA
--- a/manifest.json
+++ b/manifest.json
@ -41,6 +41,7 @@
 		"Philip McMahon"
 	],
 	"finished_chunks": [
+		"front-title",
 		"01-title",
 		"01-01",
 		"01-02",