From e095a4742e99bc7cf23c32e40c2dfe5b84fdea90 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Thu, 2 May 2019 23:14:09 +1000
Subject: [PATCH] Thu May 02 2019 23:14:09 GMT+1000 (West Pacific Standard
 Time)

---
 front/title.txt | 10 +---------
 manifest.json   |  3 ++-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/front/title.txt b/front/title.txt
index ed857d4..0f300de 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,9 +1 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-1 Tesalonika
-=======
-1 Tesalonaika
->>>>>>> ac5d46482d7e40654a642a97acb46e0e5c7797de
-=======
-1 Tesalonaika
->>>>>>> ac1fb24edc48dfcbd1511a18ab27022e07e39199
+1 Tesalonika
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index ff98ade..573a3c0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -37,7 +37,8 @@
 	"translators": [
 		"wasabamal 1",
 		"WOLTER SIREW",
-		"ROSA KERRY"
+		"ROSA KERRY",
+		"sam"
 	],
 	"finished_chunks": [
 		"01-01",