From 49eb5ced8bac16a18f372430a2015209f6fa5112 Mon Sep 17 00:00:00 2001
From: Bshop2 <you@example.com>
Date: Mon, 30 Dec 2019 16:17:42 +0200
Subject: [PATCH] Mon Dec 30 2019 16:17:42 GMT+0200 (South Africa Standard
 Time)

---
 01/01.txt       |  6 +-----
 01/title.txt    | 10 +---------
 front/title.txt |  6 +-----
 manifest.json   | 18 ++++++++++--------
 4 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/01/01.txt b/01/01.txt
index cc668d5..605785a 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 1 \v 1 \v 2 \v 3 Ili ni vumbuluso la Yesu Kristu lamene Mulungu anamupasa kuti aonese akapolo ake zamene zizacitika manje-manje. Anazionesa kupitira mwa mngelo wake kwa Yohane. Yohane anacitira umboni mau a Mulungu na pa umboni operekedwa wa Yesu Khristu, zinthu zonse zamene anaona. Ni odala amene abelenga mokweza, na amene amvera mau ya uneneri, na bamene bagonjera zamene zinalembedwamo, cifukwa nthawi ili pafupi.
-=======
-\c 1 \v 1 \v 3 Ichi ni chivumbuluso cha Yesu Klistu chamene Mulungu anamu pasa kuti alangize bantchito bake vintu vamene vifunika kuchitika kosa taya ntawi. Anazibisa ichi chintu muku tuma mungelo wake kuli wantchito wake Yohane. \v 2 Yohane anapeleka umboni pa mau ya Mulungu na umboni
->>>>>>> 1dadec7d9b0a000d2dba1dd240dc74f95bb143b5
+\c 1 \v 1 \v 3 Ichi ni chivumbuluso cha Yesu Klistu chamene Mulungu anamu pasa kuti alangize bantchito bake vintu vamene vifunika kuchitika kosa taya ntawi. Anazibisa ichi chintu muku tuma mungelo wake kuli wantchito wake Yohane. \v 2 Yohane anapeleka umboni pa mau ya Mulungu na umboni
\ No newline at end of file
diff --git a/01/title.txt b/01/title.txt
index c160899..ee65ec5 100644
--- a/01/title.txt
+++ b/01/title.txt
@@ -1,9 +1 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-Ici nichivumbuluso cha yesu kristu ana mupasa kulangiza apuzisi ake ndipo chizachitika manje manje .
-=======
-Mutu 1
->>>>>>> e420be4f253cdc4b36bad4180b49a52aeb350723
-=======
-Mutu 1
->>>>>>> 1dadec7d9b0a000d2dba1dd240dc74f95bb143b5
+Mutu 1
\ No newline at end of file
diff --git a/front/title.txt b/front/title.txt
index 69f7449..1153bbb 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Chibvumbuluso
-=======
-Chivumbuluso
->>>>>>> 1dadec7d9b0a000d2dba1dd240dc74f95bb143b5
+Chivumbuluso
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index d9d75b5..68f9b63 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
 	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
-		"build": "148"
+		"build": "2"
 	},
 	"target_language": {
 		"id": "nya-x-nyanja",
@@ -27,8 +27,8 @@
 			"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"
 		}
 	],
 	"parent_draft": {},
@@ -42,6 +42,13 @@
 		"Timothy Muzgatama"
 	],
 	"finished_chunks": [
+		"front-title",
+		"01-title",
+		"10-01",
+		"10-03",
+		"10-05",
+		"10-08",
+		"10-10",
 		"11-title",
 		"11-03",
 		"11-06",
@@ -52,11 +59,6 @@
 		"11-16",
 		"11-18",
 		"11-19",
-		"10-01",
-		"10-03",
-		"10-05",
-		"10-08",
-		"10-10",
 		"17-title"
 	]
 }
\ No newline at end of file