Thu Mar 08 2018 00:15:36 GMT+0200 (South Africa Standard Time)

2018-03-08 00:15:37 +02:00 · 2018-03-08 00:15:37 +02:00 · 92ded2ab8c
parent 3673ebbe86
commit 92ded2ab8c
2 changed files with 2 additions and 5 deletions
--- a/front/title.txt
+++ b/front/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-luka
-=======
-Luke
->>>>>>> c4ed46abfc0e8d440fac958c03c512b01d1e97f9
+Luka
--- a/manifest.json
+++ b/manifest.json
@ -42,6 +42,7 @@
 		"stewardd"
 	],
 	"finished_chunks": [
+		"front-title",
 		"01-title",
 		"01-01",
 		"01-05",