From efddec9643a8476babe183e56a0912d1118f5b68 Mon Sep 17 00:00:00 2001
From: D0131moses <d0131moses@noreply.example.org>
Date: Tue, 23 Apr 2024 13:29:57 +1000
Subject: [PATCH] Tue Apr 23 2024 13:29:57 GMT+1000 (Papua New Guinea Time)

---
 10/01.txt     |  6 +---
 manifest.json | 97 ++++++++++++++++++++++++---------------------------
 2 files changed, 47 insertions(+), 56 deletions(-)

diff --git a/10/01.txt b/10/01.txt
index 25758f3..e1c2f64 100644
--- a/10/01.txt
+++ b/10/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 1 Eto Bada na amita ambotane 12 ainge avo jage enu puto vahita eo enana ta dei ahihi sasamuna kurumbari pambari amita sovera iketo eto bouka memega korere neite neite peae be ari kokojekari amita sovera te vahi amita ambotane dei ikena
-=======
-\v 1 Bada na tohota ambotane 12 ainge avo jage enu puto vahita eo enana ta dei ahihi sasamuna kurumbari pambari amite eto bouka memega korere neite kainte peae avo ari kokojekari amita sovera avo tohota ambotane ta dei ikena.
->>>>>>> 6b1261df7fdc18ff6eb6f4b9260e991723b5d9b8
+\c 10 \v 1 Bada na tohota ambotane 12 ainge avo jage enu puto vahita eo enana ta dei ahihi sasamuna kurumbari pambari amite eto bouka memega korere neite kainte peae avo ari kokojekari amita sovera avo tohota ambotane ta dei ikena.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 1b55f80..9b74191 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "mat",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "55"
 	},
-	"package_version": 7,
 	"target_language": {
 		"name": "Pahina",
 		"direction": "ltr",
@@ -20,31 +13,45 @@
 		"is_gateway_language": false,
 		"id": "okv-x-pahina"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "mat",
+		"name": "Matthew"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"pahina"
-	],
 	"source_translations": [
 		{
 			"language_id": "en",
 			"resource_id": "ulb",
 			"checking_level": "3",
-			"date_modified": 20170329,
-			"version": "9"
-		},
-		{
-			"language_id": "en",
-			"resource_id": "ulb",
-			"checking_level": "3",
-			"date_modified": 20170329,
-			"version": "9"
+			"date_modified": "2022-03-24T15:58:30.7781724+00:00",
+			"version": "21-05"
 		}
 	],
+	"translators": [
+		"pahina",
+		"D0131moses"
+	],
 	"finished_chunks": [
+		"front-title",
+		"01-title",
+		"01-01",
+		"01-04",
+		"01-07",
+		"01-09",
+		"01-12",
+		"01-15",
+		"01-18",
+		"01-20",
+		"01-22",
+		"01-24",
 		"02-title",
+		"02-01",
 		"02-04",
 		"02-07",
 		"02-09",
@@ -53,26 +60,7 @@
 		"02-16",
 		"02-17",
 		"02-19",
-		"02-01",
 		"02-22",
-		"front-title",
-		"01-title",
-		"01-09",
-		"01-12",
-		"01-15",
-		"01-18",
-		"01-20",
-		"01-22",
-		"01-24",
-		"01-07",
-		"01-01",
-		"01-04",
-		"06-title",
-		"06-03",
-		"06-05",
-		"06-08",
-		"06-11",
-		"06-14",
 		"05-title",
 		"05-01",
 		"05-05",
@@ -80,6 +68,20 @@
 		"05-11",
 		"05-13",
 		"05-15",
+		"06-title",
+		"06-01",
+		"06-03",
+		"06-05",
+		"06-08",
+		"06-11",
+		"06-14",
+		"06-16",
+		"06-19",
+		"06-22",
+		"06-25",
+		"06-27",
+		"06-30",
+		"06-32",
 		"07-title",
 		"07-01",
 		"07-03",
@@ -90,16 +92,9 @@
 		"07-15",
 		"07-18",
 		"07-21",
-		"07-26",
 		"07-24",
+		"07-26",
 		"07-28",
-		"06-01",
-		"06-16",
-		"06-19",
-		"06-22",
-		"06-27",
-		"06-30",
-		"06-32",
 		"08-title",
 		"08-01",
 		"08-04",
@@ -122,6 +117,7 @@
 		"09-10",
 		"09-12",
 		"09-14",
+		"09-16",
 		"09-17",
 		"09-18",
 		"09-20",
@@ -133,8 +129,7 @@
 		"09-35",
 		"09-37",
 		"10-title",
-		"09-16",
-		"06-25",
+		"10-01",
 		"10-02",
 		"10-05",
 		"10-08",