From 5c2cd5a22480e9aa77e2b28729a024ff3a6862af Mon Sep 17 00:00:00 2001
From: jdwood <jdwood@noreply.door43.org>
Date: Wed, 4 Sep 2019 15:30:33 +0100
Subject: [PATCH] Wed Sep 04 2019 15:30:33 GMT+0100 (WAT)

---
 .DS_Store                                     | Bin 8196 -> 8196 bytes
 ...-conflict-20190904-151751-U5ZMAUN.DS_Store | Bin 0 -> 8196 bytes
 01/29.txt                                     |   2 +-
 manifest.json                                 | 214 +++++++++++++++++-
 4 files changed, 214 insertions(+), 2 deletions(-)
 create mode 100644 .sync-conflict-20190904-151751-U5ZMAUN.DS_Store

diff --git a/.DS_Store b/.DS_Store
index e0a8299eb63e3f6372840b6d4938bdba9ebfad69..a6261fd912e9417da3473bf168d8837ead88afc9 100644
GIT binary patch
delta 250
zcmZp1XmOa}&*-%=U^hRb*JK`n3XYWG<ea4Z{G7?v0+|TTZDfwMAd<{%WX^A7PP7n`
zvfaoWX<;OpYGlrBWRA56lCs&zoZlk(aJOxa7Tv+PnO)*L%VcMfM7Z!|d>Xbg0sz~O
BUa$ZF

delta 95
zcmZp1XmOa}&uFtTU^hRb&14>dipf(25+<_=CQL2|;uk<1DU>kz6cAerCrn-g#Ihm@
nlly@9KM)s)CQN=PnzlJkY$fBwf-jrdCBCyvzAc&q75E4MmZv3X

diff --git a/.sync-conflict-20190904-151751-U5ZMAUN.DS_Store b/.sync-conflict-20190904-151751-U5ZMAUN.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..0261565d25ef5a2c6a3638b3f8aec747bc55ad57
GIT binary patch
literal 8196
zcmeI0y>1gh5XWZ|2LcYkNeWUPFMx9KcXtY=p+ZVw(;;jTkZjH(PJcq8aLW^<rK6>z
zq@bXsi<CMNkHF0CtUa@bn@C6z>`J?1|9577cVm0kdjMdL&PFM~J^*ZDCtIuH@P|h8
z)JtuRm8WP8#>4m|Js#$hX~{DRu>!FIu>!FIu>!FIH>Co&XH(l;vG2RtIK~RZ3jCK9
zp!FfaPBvp(IBS;<9PAMQZ3Si9@O6z|piS6jYzt>`2AgrAXkDn`BZhI|s3+`~u`Qf+
z;b8diVVG?Agkmfm^C#9FOy+DHV+CRb$`zoqdj%fB3A}-sI=^ps9?Q8&-s_FdW<!9V
zAKzcvM2omdK3X|9eJ!2|eE&s(Yj6PR=yW)Kndf8rJzGJ+0d9F+fam=$6z}{6ROt%n
zRujtK41rAztbX9cO$i*h<-{hCK&flsxxc_x2y6ww2MlaUV85Vvdxxkm$~u?227dPb
z?GV`3z<bX*aa#fhcPQQhQC|Y3u7MZczY_vG8o2k26L%Dl?%M%T7eJvaph>)cHw1Py
zuttxu=(FldVE>BZy}krWT>;_3`KNH8fhcI;-P|TdT>=O9DIS4VUjn7Bf&3Y!;m-mE
z4ctBD#Hj*qFMy~EpwJc2Bosgwco^Q{p$1m>yrTlTUDqa1K%pxjoO@tB1lBe1_BRIB
z70_+(1Vmljq0lvO>Vb_A*wDZ&Dn2D{DBupodtCs9u7O{@f3VV|5Ueyi4>_@3X*MX{
z0#O%0p(~(CynnFLq!6q$Tc0?wT4@H$FNa!bq^^MQgMb_G3f@5uZ($}2D`Z_>`~ObN
z$|Cov5-O#<^YW~|oSF@e!?i20?jrZ;{QqS2^Z#q-kAblQu>v>00;bYC?j7NE^4Yp{
z#dOwAu)n}gjr<B{Z3qtPK>)tz<GA%r(3N5`wuQ4c6m=Vl*8O+*`ws%*{!fRvx!mXF
RwkvhL;l}-+zPSHL`wc^k$Qu9v

literal 0
HcmV?d00001

diff --git a/01/29.txt b/01/29.txt
index f0de8c2..a7c5df9 100644
--- a/01/29.txt
+++ b/01/29.txt
@@ -1 +1 @@
-Azadusua kua kondua kua lunungu lulo, kua nsita, kua nzinunu ye wangubi. Azala ye maketo, vandasanga, minzonza, luvunu ye kakani mambi, Ena ankua makela, ankua kitantu ye Nzambi, mimvunzi. Ankua mayema ye kinua kia saka, nkuamusu za kingolo. A yindulanga nzila zi fueni mu vanga mambi ye akolamananga ma se ye ngudi zawu. Yawu ena mazengi, ka alendi silua vuvuv ko, ka ena ye zola kua ki
\ No newline at end of file
+\v 29 Azadusua kua kondua kua lunungu lulo, kua nsita, kua nzinunu ye wangubi. Azala ye maketo, vandasanga, minzonza, luvunu ye kakani mambi, \v 30 Ena ankua makela, ankua kitantu ye Nzambi, mimvunzi. Ankua mayema ye kinua kia saka, nkuamusu za kingolo. A yindulanga nzila zi fueni mu vanga mambi ye akolamananga ma se ye ngudi zawu. \v 31 Yawu ena mazengi, ka alendi silua vuvuv ko, ka ena ye zola kua Kinzambi ko ye ka afuilanga aniawu nkenda ko.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 59b8199..91b4ae2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1 +1,213 @@
-{"package_version":7,"format":"usfm","generator":{"name":"ts-android","build":176},"target_language":{"direction":"ltr","id":"ktu-x-kimboma","name":"Kimboma"},"project":{"id":"rom","name":"Romans"},"type":{"id":"text","name":"Text"},"resource":{"id":"reg"},"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":"2017-11-29T00:00:00+00:00","version":"12"}],"translators":["kimboma","John Wood"],"finished_chunks":["front-title","01-title","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","08-06","08-09","08-11","08-12","08-14","08-16","08-18","08-20","08-23","08-26","08-28","08-31","08-33","08-35","08-37","09-title","09-01","09-03","09-06","09-08","09-10","09-14","09-17","09-19","09-22","09-25","09-27","09-30","09-32","10-title","10-01","10-04","10-06","10-08","10-11","10-14","10-16","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","15-08","15-10","15-12","15-13","15-14","15-15","15-17","15-20","15-22","15-24","15-26","15-28","15-30","15-33","16-title","16-01","16-03","16-06","16-09","16-12","16-15","16-17","16-19","16-21","16-23","16-25","16-27","01-01","01-04","01-07","01-08","01-11","01-13","01-16","01-18","01-20","01-22","01-24","01-26","01-28"]}
\ No newline at end of file
+{
+	"package_version": 7,
+	"format": "usfm",
+	"generator": {
+		"name": "ts-desktop",
+		"build": "132"
+	},
+	"target_language": {
+		"direction": "ltr",
+		"id": "ktu-x-kimboma",
+		"name": "Kimboma"
+	},
+	"project": {
+		"id": "rom",
+		"name": "Romans"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
+	"resource": {
+		"id": "ulb",
+		"name": "Unlocked Literal Bible"
+	},
+	"source_translations": [
+		{
+			"language_id": "en",
+			"resource_id": "ulb",
+			"checking_level": "3",
+			"date_modified": 20170329,
+			"version": "9"
+		}
+	],
+	"translators": [
+		"kimboma",
+		"John Wood"
+	],
+	"finished_chunks": [
+		"front-title",
+		"01-title",
+		"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",
+		"08-06",
+		"08-09",
+		"08-11",
+		"08-12",
+		"08-14",
+		"08-16",
+		"08-18",
+		"08-20",
+		"08-23",
+		"08-26",
+		"08-28",
+		"08-31",
+		"08-33",
+		"08-35",
+		"08-37",
+		"09-title",
+		"09-01",
+		"09-03",
+		"09-06",
+		"09-08",
+		"09-10",
+		"09-14",
+		"09-17",
+		"09-19",
+		"09-22",
+		"09-25",
+		"09-27",
+		"09-30",
+		"09-32",
+		"10-title",
+		"10-01",
+		"10-04",
+		"10-06",
+		"10-08",
+		"10-11",
+		"10-14",
+		"10-16",
+		"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",
+		"15-08",
+		"15-10",
+		"15-12",
+		"15-13",
+		"15-14",
+		"15-15",
+		"15-17",
+		"15-20",
+		"15-22",
+		"15-24",
+		"15-26",
+		"15-28",
+		"15-30",
+		"15-33",
+		"16-title",
+		"16-01",
+		"16-03",
+		"16-06",
+		"16-09",
+		"16-12",
+		"16-15",
+		"16-17",
+		"16-19",
+		"16-21",
+		"16-23",
+		"16-25",
+		"16-27",
+		"01-01",
+		"01-04",
+		"01-07",
+		"01-08",
+		"01-11",
+		"01-13",
+		"01-16",
+		"01-18",
+		"01-20",
+		"01-22",
+		"01-24",
+		"01-26",
+		"01-28",
+		"01-29"
+	]
+}
\ No newline at end of file