Thu May 09 2019 16:54:49 GMT+0700 (SE Asia Standard Time)

2019-05-09 16:54:49 +07:00 · 2019-05-09 16:54:49 +07:00 · 14aadec6a8
parent 2afbb4d5eb
commit 14aadec6a8
2 changed files with 2 additions and 5 deletions
--- a/front/title.txt
+++ b/front/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-1 Tesalonika
-=======
-Tesalonika
->>>>>>> f6c15ca39ced0f85cdd35ff37ff66fb719ce27f7
+1 Tesalonika
--- a/manifest.json
+++ b/manifest.json
@ -37,6 +37,7 @@
 		"Theresia"
 	],
 	"finished_chunks": [
+		"front-title",
 		"01-title",
 		"01-01",
 		"01-02",