From cc0d1b7afd845eb7eb2d4e198c0fa5c842b0e659 Mon Sep 17 00:00:00 2001
From: RIF <it.rif004@gmail.com>
Date: Mon, 27 Sep 2021 13:01:25 +0100
Subject: [PATCH] Mon Sep 27 2021 13:01:25 GMT+0100 (W. Central Africa Standard
 Time)

---
 01/01.txt       |  6 +-----
 01/04.txt       |  6 +-----
 01/title.txt    |  6 +-----
 front/title.txt |  6 +-----
 manifest.json   | 37 +++++++++++++++++++++----------------
 5 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/01/01.txt b/01/01.txt
index 21b894e..f24599a 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 1 Ni Bulus Ayam Aarikeya, ta ne aace Timotawus nen cimi dorma ne abasce da cinima Arikewa yete dawiawotaya nge filimon \v 2 Ne aace Afiya ne  Arkifus Abasce da cnimsa henda kerto ,   ne ikilisiya wu gbawi ne wa ha nda;\v 3  Bwhatem ne zangzangto wawo ne waha dega na Arikeha Adace na Adajiye Yesu Aarikewăa.
-=======
-\v 1 Bulus ye koyati da  pursuna dwa Yeso Kristi ya,ni amaya ya Timotawus woni Philemon ha,abazaje da cinama,,ni a maya ya \v 2 Afiya,wani Archippus abazhi cinam njemi afinda kirto, ni ikklisiya wan  gbau naha wa: \v 3 bwahatima, ni kato zangzangto wo kat naha daga na Rike ha Adanje ni Adajiye  Yeso Almasihu.
->>>>>>> e7be6d1d83bbdbe600d5e8981f8cddd87c680d0a
+\c 1 \v 1 Ni Bulus Ayam Aarikeya, ta ne aace Timotawus nen cimi dorma ne abasce da cinima Arikewa yete dawiawotaya nge filimon \v 2 Ne aace Afiya ne  Arkifus Abasce da cnimsa henda kerto ,   ne ikilisiya wu gbawi ne wa ha nda; \v 3 Bwhatem ne zangzangto wawo ne waha dega na Arikeha Adace na Adajiye Yesu Aarikewăa.
\ No newline at end of file
diff --git a/01/04.txt b/01/04.txt
index 137dff7..634c09d 100644
--- a/01/04.txt
+++ b/01/04.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 4 Kogamen nen hima Arike. cima nderrezeti  \v 5 Nenza bhatemami ne jirimsiwa zanewa aace da Dajiye Yesu. \v 6  Nen huma jirimsi wa wone maa mbi bwha tawa wo deda Almasihu.\v 7  Gufwonu pengpeng swa, kumburnu fikin ndwa bhatemami,ndwa sukze mba maa twoito lauwa aace.
-=======
-\v 4 4 ko gmin nan bwa Rike de. Nan gna cima  zha. \v 5 Ni za bhadima, ni jirimsi minga yeshiyin da Adajiye Yeso ni wa ace won mbida Rike. \v 6 Nan bwa Rike de giho nui de na jirimsi wa yi wo sogi wa wasi ma mbi buha awido ni Almasihu .Nda mi  ni wu hu bi  wuhu zun ni zemzemto ni jima zemi. \v 7 Ndwa gufuzu wan bida Arike gonga cima dwa geh ache.
->>>>>>> e7be6d1d83bbdbe600d5e8981f8cddd87c680d0a
+\v 4 Kogamen nen hima Arike. cima nderrezeti \v 5 Nenza bhatemami ne jirimsiwa zanewa aace da Dajiye Yesu. \v 6 Nen huma jirimsi wa wone maa mbi bwha tawa wo deda Almasihu. \v 7 Gufwonu pengpeng swa, kumburnu fikin ndwa bhatemami,ndwa sukze mba maa twoito lauwa aace.
\ No newline at end of file
diff --git a/01/title.txt b/01/title.txt
index bedca94..e81955a 100644
--- a/01/title.txt
+++ b/01/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Tangera 1
-=======
-Tangiya 1
->>>>>>> e7be6d1d83bbdbe600d5e8981f8cddd87c680d0a
+Tangera 1
\ No newline at end of file
diff --git a/front/title.txt b/front/title.txt
index f2ba3c2..c6af618 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Filimon
-=======
-Philemon
->>>>>>> e7be6d1d83bbdbe600d5e8981f8cddd87c680d0a
+Filimon
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 058ad50..4281856 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "phm",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "5"
 	},
-	"package_version": 7,
 	"target_language": {
 		"name": "Nhanda",
 		"direction": "ltr",
@@ -20,24 +13,36 @@
 		"is_gateway_language": false,
 		"id": "nha"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "phm",
+		"name": "Philemon"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"samari",
-		"mary"
-	],
 	"source_translations": [
 		{
 			"language_id": "en",
 			"resource_id": "ulb",
 			"checking_level": "3",
-			"date_modified": 20170329,
-			"version": "9"
+			"date_modified": "2017-11-29T00:00:00+00:00",
+			"version": "12"
 		}
 	],
+	"translators": [
+		"samari",
+		"mary",
+		"RIF"
+	],
 	"finished_chunks": [
+		"front-title",
+		"01-title",
+		"01-01",
+		"01-04",
 		"01-08",
 		"01-10",
 		"01-14",