Thu Jul 30 2020 16:27:04 GMT+0200 (South Africa Standard Time)

2020-07-30 16:27:05 +02:00 · 2020-07-30 16:27:05 +02:00 · 45257a8983
parent 2d472c116c
commit 45257a8983
2 changed files with 2 additions and 5 deletions
--- a/front/title.txt
+++ b/front/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Marko
-=======
-Maliko
->>>>>>> 7cf1b4e3f4c83af340e68bcdffba48b3ec9b8d25
+Marko
--- a/manifest.json
+++ b/manifest.json
@ -37,6 +37,7 @@
 		"Abraham Chitambi"
 	],
 	"finished_chunks": [
+		"front-title",
 		"01-title",
 		"01-01",
 		"01-04",