From bec4442ee127b4d9aa03e78d8d7d21d72d8bc8b9 Mon Sep 17 00:00:00 2001
From: Bshop2 <you@example.com>
Date: Mon, 13 Jul 2020 10:38:27 +0200
Subject: [PATCH] Mon Jul 13 2020 10:38:26 GMT+0200 (South Africa Standard
 Time)

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

diff --git a/front/title.txt b/front/title.txt
index e2f5cb5..541f25c 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-2 Timoti
-=======
-1 Timoti
->>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567
+1 Timoti
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 3a7dad4..5f181a1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -33,7 +33,8 @@
 	],
 	"parent_draft": {},
 	"translators": [
-		"siachinene mary"
+		"siachinene mary",
+		"Timothy Muzgatama"
 	],
 	"finished_chunks": [
 		"01-title",