From 92ded2ab8ce1d4293c37c8f07c93fa2cfc6a140b Mon Sep 17 00:00:00 2001
From: stewardd <stewardd@noreply.door43.org>
Date: Thu, 8 Mar 2018 00:15:37 +0200
Subject: [PATCH] Thu Mar 08 2018 00:15:36 GMT+0200 (South Africa Standard
 Time)

---
 front/title.txt | 6 +-----
 manifest.json   | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/front/title.txt b/front/title.txt
index 8ce6649..1489458 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-luka
-=======
-Luke
->>>>>>> c4ed46abfc0e8d440fac958c03c512b01d1e97f9
+Luka
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 0966a41..93d0ddc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -42,6 +42,7 @@
 		"stewardd"
 	],
 	"finished_chunks": [
+		"front-title",
 		"01-title",
 		"01-01",
 		"01-05",