From 5f7c2d9a7a9fba22e99ae0fa8e293bc43acc8656 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Tue, 27 Aug 2019 10:07:50 +0100
Subject: [PATCH] Tue Aug 27 2019 10:07:50 GMT+0100 (WAT)

---
 .DS_Store                                     | Bin 8196 -> 6148 bytes
 ...-conflict-20190826-120457-BJXFSR6.DS_Store | Bin 0 -> 6148 bytes
 manifest.json                                 | 324 +++++++++++++++++-
 3 files changed, 323 insertions(+), 1 deletion(-)
 create mode 100644 .sync-conflict-20190826-120457-BJXFSR6.DS_Store

diff --git a/.DS_Store b/.DS_Store
index cd104aed112d1ba0129ba27eecf717d86e7d69f9..a36adaf3a1c5219e8136fac11cacaae0c5ab15ea 100644
GIT binary patch
delta 168
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGqg`k6q~50$jCA=z?zX|GLL|i#i2DoaTW$W
zhIEEZhLYTT7nhXMl4J&ko1M9lAT7vpDM)gY;{>FcwmNJ~<Y8aT&cPwb3|7n_zzw8b
ifw+BR;&<lB{4$1&43lkmq<NSi&H%ZLVRJms9A*F}bRk#(

literal 8196
zcmeI1L2FY%5XWa@lz>R0RGORb>ZRm0Z4*KCStEE9YI_!1S_{TRX%Rf->L(Dvg9mSd
zCqIBEzk@d~-t`+evpc()|4VaL>Mrcg<G-`N-AvxR&At$k+de%giMmA8;wrXtnVU0;
z^h;eR4OJepbv&M)9hE!#lks%HGYdHaIRZHXIRZHXIRgJm1bEMu(ps|bhu+-g2;>O-
zml2TXL%~&SrFIsqe{^u;j{t0&Ec?RO9l2mzsIAn_g5@4AE(~QGhB`fBxG<dcLj5YW
zvtYw;a(ei1I<wOgiu1EGzwqwls$g@QBakDo7y&uEH))NI=$KC6{C?x(3)?rIj7A5i
zC;LR--yA;npfqkgIat~^eL8<9;J*Blfeq?W33Jia)u`Kf_9}4?{&o(lTRyp7^j}B*
zm1E_s1Ak52J)iaYXV^13@F}goU*rE&P9OMp6Q6a%H~JF(2J$<fl)nM|D)Cu2e4_(D
zJUk`-o5;WRPWhX_pRbd3!#6teQ~bA(-~FciE#Pmb^|NmHMo0cs2FUsc$Zx-oI`Ho$
z{s8z!M}G1j*7(1bKLq}Kovfd^{vq-^GJ&lB7V@w6qYnI$xCejW8y)$Nf`3Up<gboB
zhjrlJ6nEx(-K^i}$giS*Eq~julv4tq-!RT~!#6tc=|}Xh<?qU8<zW5}#NDqS^VjIW
zcSZEC<!}47axj16eNqzUuhD@YpARL~^0!z~KIU({f7l<sU!w!xeU0m{=kKoaF@JB1
zyN?g%uhEfTME_d;w(ctj^Y@Opdp_o`(Sc7N#Q!24(o34q^V*I>bP0Ryy|nvQhT5?<
zVvD^vug^OV$W4mCg>coC^Z$e8@Bfp3zQ_^C5jcMlaLv)qNVXie<g+zcFStJ8Dn<Ne
z!TKTGh>Pg{IL<cxVaV5o_El<U!Ez6mzwjbJe(&V{Uw;?CKIsbiN+dpc|CdOd<MIc6
Cpwr+0

diff --git a/.sync-conflict-20190826-120457-BJXFSR6.DS_Store b/.sync-conflict-20190826-120457-BJXFSR6.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..2bdffaae0c7c91f7099346f905a247205184bf28
GIT binary patch
literal 6148
zcmeHKJ5Iwu5S;-Rk!W1fu_r*v4OWpkK`ww4O96r96iM$6(Q=gBCb!@SyxAE-EXyqg
zypd+!e&((1S9o?rL|2D)DN>8b0&Xa87N%zV<`cV$l?teK#_M*u-t^sWk~zO%+)D0c
zE6=hY@$WwJ<zCk}O?%jHL{9H7pXI<auj|{{z1`E#JL%Dmq)`DXKn17(75LW*pk|vb
zZX6k@02QDDX9ev4kl=<naBwWY4usMI0PPxI4CC4cz!aDR2S@C{)TuzHYP1;YbgZYy
z%YlQV(?z5C(0H;&hoa@_I6swi(d@`b1*pJSfoq@ER{tO1GyVUV#2FQ!0)I*Yt(tYS
z!Y4&-oqU|t+5~@ue;aa3I>P7@fQgmj+l#zpW8~$)!LiV>Ug$tx1WXqi75EJWz5sX6
BCu#ry

literal 0
HcmV?d00001

diff --git a/manifest.json b/manifest.json
index 3e7752a..446a606 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1 +1,323 @@
-{"project":{"id":"mrk","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":176},"package_version":7,"target_language":{"direction":"ltr","id":"ktu-x-kimboma","name":"Kimboma"},"format":"usfm","resource":{"id":"reg"},"translators":["kimboma"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":3,"date_modified":20170221,"version":"9"}],"finished_chunks":["01-01","01-04","01-07","01-09","01-12","01-14","01-16","01-21","01-23","01-27","01-29","01-32","01-35","01-38","01-40","01-43","01-45","02-01","02-03","02-05","02-08","02-10","02-13","02-15","02-17","02-18","02-20","01-19","02-22","02-23","02-25","02-27","03-01","03-03","03-05","03-07","03-09","03-11","03-13","03-17","03-20","03-23","03-26","03-28","03-31","03-33","04-01","04-03","04-06","04-08","04-10","04-13","04-16","04-18","04-21","04-24","04-26","04-30","04-33","04-35","04-38","04-40","05-01","05-03","05-05","05-07","05-09","05-11","05-14","05-16","05-18","05-21","05-25","05-28","05-30","05-33","05-35","05-36","05-39","05-41","11-01","11-04","11-07","11-11","11-13","11-15","11-17","11-20","11-22","11-24","11-27","11-29","11-31","06-01","06-04","06-07","06-10","06-12","06-14","06-16","06-18","06-21","06-23","06-26","06-30","06-33","06-35","06-37","06-39","06-42","06-45","06-48","06-51","06-53","06-56","07-01","07-02","07-05","07-06","07-08","07-11","07-14","07-17","07-20","07-24","07-27","07-29","07-31","07-33","07-36","08-01","08-05","08-07","08-11","08-14","08-16","08-18","08-20","08-22","08-24","08-27","08-29","08-31","08-33","08-35","08-38","09-01","09-04","09-07","09-09","09-11","09-14","09-17","09-20","09-23","09-26","09-28","09-30","09-33","09-36","09-38","09-40","09-42","09-45","09-47","09-49","10-01","10-05","10-07","10-10","10-13","10-15","10-17","10-20","10-23","10-26","10-29","10-32","10-35","10-38","10-41","10-43","10-46","10-49","10-51","16-01","16-03","16-05","16-08","16-09","16-12","16-14","16-17","16-19","15-01","15-04","15-06","15-09","15-12","15-14","15-16","15-19","15-22","15-25","15-29","15-31","15-33","15-36","15-39","15-42","15-45","12-01","12-04","12-06","12-08","12-10","12-13","12-16","12-18","12-20","12-24","12-26","12-28","12-32","12-35","12-38","12-41","12-43","13-01","13-03","13-05","13-07","13-09","13-11","13-14","13-17","13-21","13-24","13-28","13-30","13-33","13-35","14-01","14-03","14-06","14-10","14-12","14-15","14-17","14-20","14-22","14-26","14-28","14-30","14-32","14-35","14-37","14-40","14-43","14-47","14-51","14-53","14-55","14-57","14-60","14-63","14-66","14-69","14-71","00-title","01-title","02-title","03-title","05-title","06-title","07-title","08-title","09-title","10-title","11-title","12-title","13-title","14-title","15-title","16-title"]}
\ 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": "mrk",
+		"name": "Mark"
+	},
+	"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"
+	],
+	"finished_chunks": [
+		"front-title",
+		"01-title",
+		"01-01",
+		"01-04",
+		"01-07",
+		"01-09",
+		"01-12",
+		"01-14",
+		"01-16",
+		"01-19",
+		"01-21",
+		"01-23",
+		"01-27",
+		"01-29",
+		"01-32",
+		"01-35",
+		"01-38",
+		"01-40",
+		"01-43",
+		"01-45",
+		"02-title",
+		"02-01",
+		"02-03",
+		"02-05",
+		"02-08",
+		"02-10",
+		"02-13",
+		"02-15",
+		"02-17",
+		"02-18",
+		"02-20",
+		"02-22",
+		"02-23",
+		"02-25",
+		"02-27",
+		"03-title",
+		"03-01",
+		"03-03",
+		"03-05",
+		"03-07",
+		"03-09",
+		"03-11",
+		"03-13",
+		"03-17",
+		"03-20",
+		"03-23",
+		"03-26",
+		"03-28",
+		"03-31",
+		"03-33",
+		"04-01",
+		"04-03",
+		"04-06",
+		"04-08",
+		"04-10",
+		"04-13",
+		"04-16",
+		"04-18",
+		"04-21",
+		"04-24",
+		"04-26",
+		"04-30",
+		"04-33",
+		"04-35",
+		"04-38",
+		"04-40",
+		"05-title",
+		"05-01",
+		"05-03",
+		"05-05",
+		"05-07",
+		"05-09",
+		"05-11",
+		"05-14",
+		"05-16",
+		"05-18",
+		"05-21",
+		"05-25",
+		"05-28",
+		"05-30",
+		"05-33",
+		"05-35",
+		"05-36",
+		"05-39",
+		"05-41",
+		"06-title",
+		"06-01",
+		"06-04",
+		"06-07",
+		"06-10",
+		"06-12",
+		"06-14",
+		"06-16",
+		"06-18",
+		"06-21",
+		"06-23",
+		"06-26",
+		"06-30",
+		"06-33",
+		"06-35",
+		"06-37",
+		"06-39",
+		"06-42",
+		"06-45",
+		"06-48",
+		"06-51",
+		"06-53",
+		"06-56",
+		"07-title",
+		"07-01",
+		"07-02",
+		"07-05",
+		"07-06",
+		"07-08",
+		"07-11",
+		"07-14",
+		"07-17",
+		"07-20",
+		"07-24",
+		"07-27",
+		"07-29",
+		"07-31",
+		"07-33",
+		"07-36",
+		"08-title",
+		"08-01",
+		"08-05",
+		"08-07",
+		"08-11",
+		"08-14",
+		"08-16",
+		"08-18",
+		"08-20",
+		"08-22",
+		"08-24",
+		"08-27",
+		"08-29",
+		"08-31",
+		"08-33",
+		"08-35",
+		"08-38",
+		"09-title",
+		"09-01",
+		"09-04",
+		"09-07",
+		"09-09",
+		"09-11",
+		"09-14",
+		"09-17",
+		"09-20",
+		"09-23",
+		"09-26",
+		"09-28",
+		"09-30",
+		"09-33",
+		"09-36",
+		"09-38",
+		"09-40",
+		"09-42",
+		"09-45",
+		"09-47",
+		"09-49",
+		"10-title",
+		"10-01",
+		"10-05",
+		"10-07",
+		"10-10",
+		"10-13",
+		"10-15",
+		"10-17",
+		"10-20",
+		"10-23",
+		"10-26",
+		"10-29",
+		"10-32",
+		"10-35",
+		"10-38",
+		"10-41",
+		"10-43",
+		"10-46",
+		"10-49",
+		"10-51",
+		"11-title",
+		"11-01",
+		"11-04",
+		"11-07",
+		"11-11",
+		"11-13",
+		"11-15",
+		"11-17",
+		"11-20",
+		"11-22",
+		"11-24",
+		"11-27",
+		"11-29",
+		"11-31",
+		"12-title",
+		"12-01",
+		"12-04",
+		"12-06",
+		"12-08",
+		"12-10",
+		"12-13",
+		"12-16",
+		"12-18",
+		"12-20",
+		"12-24",
+		"12-26",
+		"12-28",
+		"12-32",
+		"12-35",
+		"12-38",
+		"12-41",
+		"12-43",
+		"13-title",
+		"13-01",
+		"13-03",
+		"13-05",
+		"13-07",
+		"13-09",
+		"13-11",
+		"13-14",
+		"13-17",
+		"13-21",
+		"13-24",
+		"13-28",
+		"13-30",
+		"13-33",
+		"13-35",
+		"14-title",
+		"14-01",
+		"14-03",
+		"14-06",
+		"14-10",
+		"14-12",
+		"14-15",
+		"14-17",
+		"14-20",
+		"14-22",
+		"14-26",
+		"14-28",
+		"14-30",
+		"14-32",
+		"14-35",
+		"14-37",
+		"14-40",
+		"14-43",
+		"14-47",
+		"14-51",
+		"14-53",
+		"14-55",
+		"14-57",
+		"14-60",
+		"14-63",
+		"14-66",
+		"14-69",
+		"14-71",
+		"15-title",
+		"15-01",
+		"15-04",
+		"15-06",
+		"15-09",
+		"15-12",
+		"15-14",
+		"15-16",
+		"15-19",
+		"15-22",
+		"15-25",
+		"15-29",
+		"15-31",
+		"15-33",
+		"15-36",
+		"15-39",
+		"15-42",
+		"15-45",
+		"16-title",
+		"16-01",
+		"16-03",
+		"16-05",
+		"16-08",
+		"16-09",
+		"16-12",
+		"16-14",
+		"16-17",
+		"16-19"
+	]
+}
\ No newline at end of file