From fd86a4fd6aca7cb5820003fcb27836d4c775aec6 Mon Sep 17 00:00:00 2001
From: stewardd <stewardd@noreply.door43.org>
Date: Tue, 6 Mar 2018 22:27:02 +0200
Subject: [PATCH] Tue Mar 06 2018 22:27:01 GMT+0200 (South Africa Standard
 Time)

---
 front/title.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/front/title.txt b/front/title.txt
index 68584f4..1ba9642 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1 Batheselonika
-=======
-1 BATHESALONIKA
->>>>>>> da3528fe0925e6e5826c0ec73e48d66c72a6544c
+1 Batheselonika
\ No newline at end of file