From 3b6777d96fe88be549315cc6285a8a17a5efcf13 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Mon, 3 Jul 2023 13:54:29 +0200
Subject: [PATCH] Mon Jul 03 2023 13:54:28 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 cf8da11..894d681 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1 Pitolosi
-=======
-1 Pitrosi
->>>>>>> d12505da0585b85557c78e71502383d5cbf6b918
+1 Pitolosi
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index bbdee06..ef25f34 100644
--- a/manifest.json
+++ b/manifest.json
@@ -34,7 +34,8 @@
 	"parent_draft": {},
 	"translators": [
 		"felix",
-		"justin"
+		"justin",
+		"mutanuka nabita"
 	],
 	"finished_chunks": [
 		"01-title",