From 624d72790a796a56051dff8ab79bf3cee5d3d3f4 Mon Sep 17 00:00:00 2001
From: nicholuskombo <nicholuskombo@gmail.com>
Date: Tue, 29 Nov 2022 12:43:29 +0300
Subject: [PATCH] Tue Nov 29 2022 12:43:29 GMT+0300 (East Africa Time)

---
 01/24.txt     |   6 +-
 manifest.json | 202 +++++++++++++++++++++++++-------------------------
 2 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/01/24.txt b/01/24.txt
index f33a16f..1d27b72 100644
--- a/01/24.txt
+++ b/01/24.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 24 Huako, Nyasaye yabakalula hurula muhwekomba hwemioyo kiabu kiobumyanu handi  kiabu
-=======
-\v 24 Hulwako Nyasaye yabaleha mubwekombi bwe mioyo kiabwe balonde obumayamu. Kata nibafunakana esikiawa emibiri kiambwe. \v 25 Ohubera bakaluhania obwadieri bwa Nmyasaye ohuba obubei, Nibe hamina esilonge nende. Ohusilama ibadili yo omulongi olamwa chinyanga chiosi. Amina.
->>>>>>> 16f1073d02e0dd5c935a8ab0753ef6b8a5f0a0cf
+\v 24 Hulwako Nyasaye yabaleha mubwekombi bwe mioyo kiabwe balonde obumayamu. Kata nibafunakana esikiawa emibiri kiambwe. \v 25 Ohubera bakaluhania obwadieri bwa Nmyasaye ohuba obubei, Nibe hamina esilonge nende. Ohusilama ibadili yo omulongi olamwa chinyanga chiosi. Amina.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 744a23c..b474818 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "rom",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "83"
 	},
-	"package_version": 7,
 	"target_language": {
 		"name": "Lusonga",
 		"direction": "ltr",
@@ -20,109 +13,34 @@
 		"is_gateway_language": false,
 		"id": "luo-x-lusonga"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "rom",
+		"name": "Romans"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"martin wangoi",
-		"nicholus"
-	],
 	"source_translations": [
 		{
 			"language_id": "en",
 			"resource_id": "ulb",
 			"checking_level": "3",
-			"date_modified": 20170329,
-			"version": "9"
+			"date_modified": "2022-03-24T15:58:30.7851494+00:00",
+			"version": "21-05"
 		}
 	],
+	"translators": [
+		"martin wangoi",
+		"nicholus",
+		"nicholuskombo"
+	],
 	"finished_chunks": [
-		"11-title",
-		"11-01",
-		"11-04",
-		"11-06",
-		"11-09",
-		"11-11",
-		"11-13",
-		"11-15",
-		"11-17",
-		"11-19",
-		"11-22",
-		"11-23",
-		"11-25",
-		"11-26",
-		"11-28",
-		"11-30",
-		"11-33",
-		"11-35",
-		"12-title",
-		"12-01",
-		"12-03",
-		"12-04",
-		"12-06",
-		"12-09",
-		"12-11",
-		"12-14",
-		"12-17",
-		"13-title",
-		"12-19",
-		"13-01",
-		"13-03",
-		"13-06",
-		"13-08",
-		"13-11",
-		"13-13",
-		"14-title",
-		"14-01",
-		"14-03",
-		"14-05",
-		"14-07",
-		"14-10",
-		"14-12",
-		"14-14",
-		"14-16",
-		"14-18",
-		"14-20",
-		"14-22",
-		"15-title",
-		"06-title",
-		"06-01",
-		"06-04",
-		"06-06",
-		"06-08",
-		"06-10",
-		"06-12",
-		"06-15",
-		"06-17",
-		"06-19",
-		"06-22",
-		"07-title",
 		"front-title",
 		"01-title",
-		"07-01",
-		"07-02",
-		"07-04",
-		"07-06",
-		"07-07",
-		"07-09",
-		"07-11",
-		"07-13",
-		"07-15",
-		"07-17",
-		"07-19",
-		"07-22",
-		"07-24",
-		"05-01",
-		"05-03",
-		"05-06",
-		"05-08",
-		"05-10",
-		"05-12",
-		"05-14",
-		"05-16",
-		"05-18",
-		"05-20",
 		"01-01",
 		"01-04",
 		"01-07",
@@ -133,8 +51,10 @@
 		"01-18",
 		"01-20",
 		"01-22",
+		"01-24",
 		"01-26",
 		"01-28",
+		"01-29",
 		"01-32",
 		"02-title",
 		"02-01",
@@ -177,6 +97,42 @@
 		"04-18",
 		"04-20",
 		"04-23",
+		"05-title",
+		"05-01",
+		"05-03",
+		"05-06",
+		"05-08",
+		"05-10",
+		"05-12",
+		"05-14",
+		"05-16",
+		"05-18",
+		"05-20",
+		"06-title",
+		"06-01",
+		"06-04",
+		"06-06",
+		"06-08",
+		"06-10",
+		"06-12",
+		"06-15",
+		"06-17",
+		"06-19",
+		"06-22",
+		"07-title",
+		"07-01",
+		"07-02",
+		"07-04",
+		"07-06",
+		"07-07",
+		"07-09",
+		"07-11",
+		"07-13",
+		"07-15",
+		"07-17",
+		"07-19",
+		"07-22",
+		"07-24",
 		"08-title",
 		"08-01",
 		"08-03",
@@ -220,6 +176,54 @@
 		"10-18",
 		"10-19",
 		"10-20",
+		"11-title",
+		"11-01",
+		"11-04",
+		"11-06",
+		"11-09",
+		"11-11",
+		"11-13",
+		"11-15",
+		"11-17",
+		"11-19",
+		"11-22",
+		"11-23",
+		"11-25",
+		"11-26",
+		"11-28",
+		"11-30",
+		"11-33",
+		"11-35",
+		"12-title",
+		"12-01",
+		"12-03",
+		"12-04",
+		"12-06",
+		"12-09",
+		"12-11",
+		"12-14",
+		"12-17",
+		"12-19",
+		"13-title",
+		"13-01",
+		"13-03",
+		"13-06",
+		"13-08",
+		"13-11",
+		"13-13",
+		"14-title",
+		"14-01",
+		"14-03",
+		"14-05",
+		"14-07",
+		"14-10",
+		"14-12",
+		"14-14",
+		"14-16",
+		"14-18",
+		"14-20",
+		"14-22",
+		"15-title",
 		"15-01",
 		"15-03",
 		"15-05",