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

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

diff --git a/.DS_Store b/.DS_Store
index 40b808379df4d1231f1d4b517570fbdab846ce5f..fab6fa38cd9b5a2ac9ecf67a8c74c66a16abe5d1 100644
GIT binary patch
delta 168
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGqg`k6q~50$jCA=z?zX|GLL|i#a=U@I17Uw
zLpnnyLrHGFi%UvrNiqY&&CXnVkQQXQ6ePLHaRSmzzcy@4<Y8aT&cPwb3|7n_zzw8b
ifw+BR;&<lB{4$1&43lkmq<NSi&H%ZLVRJms9A*FpgCSl3

literal 8196
zcmeI1!AcxK5QeLDC4xB^#UMe#<ORa6t442wZ0>>(_b9koBV;oY^gfq_<dj!1&yuH*
zJVQthx#SY^S9SMJm6JUQK}a=B*Z6nU*X_Sck3AAm*uNb0h}MZ{5f{hhC3JsjJkD3E
z%_XIa7*J2IPkV<a)#SXD>4H1p4!8sEfIHw0+!Y7#%;vT@<GCM4y>|!Pf&bD0-X98F
z9Lp5z7-j1~Cr1Fp4rFP#U*;RcBE>SrI!273g;<IhOG7$hgjf!}NO@(7b&Ro`LOOhe
zG;>HNlpwQ%Ur0KIGDh#+0e7J70H57E^psBNj4sUiedW_<JvONZgVE*13DNb(aVel_
z-J}}L96Nud-U<A=;=(!VQqRmqPkv@y&ojKw=`ml=p>@L#KXU%2<v;wLIGcvQ#_7U`
z-uw<jrCa_%&hK0P1Nb7GzUCiYb9&YrzSd{(w=93{EOE9pU#$~*!`Hgymw7$gmcRNT
z@wW|sp3`Oh&=p_lmM^<6f4)1G|L9%f>=^#)ln-6;m2UYp7cl?X4SqlCnt$|#(__Bo
zYu)n8oWE=N8~OXQtNFuwoGyImYW+&L{5t3FS^nd%iL+<;E1WKT=!&m&%fE{GJ?dKi
zLM0sNnm>Ne>EMgr@Lzs!bi=1(9$26;y`_rY+}JVVp8;xA&-LP)FwJN)V|&!ji|<t}
z^}(P2;)8eYz-=9fyEv`$`TzOs_y4z@#_Qbyci;{?5ITdy!9Et4o~^B=@>#pUb&QJ}
n=hZPv2|Dv406$OvVTk(zsa#X0SjPwj&0hqF4c@r}|I~p$%1!}g

diff --git a/.sync-conflict-20190826-120456-BJXFSR6.DS_Store b/.sync-conflict-20190826-120456-BJXFSR6.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..15bd957f5faecfa9ce31cc78a70d4b41c84537f2
GIT binary patch
literal 6148
zcmeHKJ5Iwu5S;-Rk!T_+%I)ZoassT#oFErKilu;rl@v+u4si+Y#Z4%A^C7Zjxu8J;
zy^&^~cRuU&D|S30qU%$;5?PAK0%|C)W~O3s(}`T9rvj?&@v>WOw)^fd$((msZ6$ZI
zlV>@O>aX8#hp}$oH0|lQ75RAU?tQ~^UAJ#%V~3}~nLdAVwE06bLI%hH86X2>;14r^
zo^7(Y3Zx|iWPl8u8L<1IKn?4}KG3fY7#{(E_8aelXP+g2#T>vou@8g?qEQNrQq2)V
zqa6N{d39nR80Dfld}zK|b3##nJN7T0E?NiDk^wR>X5ccGOY8p+(3$yvT*MU_AOru3
z0j-)%v&JW7Z=HOc_1Xe`gnkQhJsrkdG0<Bv7S@Vy26@Gv5w8>bKre^i%Ypn6FkUER
I;5Qif0_003X8-^I

literal 0
HcmV?d00001

diff --git a/manifest.json b/manifest.json
index 2864a10..42fa972 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1 +1,252 @@
-{"project":{"id":"luk","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":176},"package_version":7,"target_language":{"name":"Kimboma","direction":"ltr","anglicized_name":"","region":"Africa","is_gateway_language":false,"id":"ktu-x-kimboma"},"format":"usfm","resource":{"id":"reg"},"translators":["kimboma"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["01-title","01-01","01-05","01-08","01-11","01-14","01-16","01-18","01-21","01-24","01-26","01-30","01-34","01-36","01-39","01-42","01-46","01-48","01-50","01-52","01-54","01-56","01-59","01-62","01-64","01-67","01-69","01-72","01-76","01-78","01-80","02-title","02-01","02-04","02-06","02-08","02-10","02-13","02-15","02-17","02-21","02-22","02-25","02-27","02-30","02-33","02-36","02-39","02-41","02-45","02-48","02-51","03-title","03-01","03-04","03-03","03-05","03-07","03-08","03-09","03-10","03-12","03-14","03-15","03-17","03-18","03-21","03-23","03-25","03-27","03-30","03-33","03-36","04-title","04-01","04-03","04-05","04-08","04-09","04-12","04-14","04-16","04-18","04-20","04-23","04-25","04-28","04-31","04-33","04-35","04-38","04-40","04-42","05-title","05-01","05-04","05-08","05-12","05-14","05-15","05-17","05-18","05-20","05-22","05-25","05-27","05-29","05-33","05-36","05-37","06-title","06-01","06-03","06-06","06-09","06-12","06-14","06-17","06-20","06-22","06-24","06-26","06-27","06-29","06-31","06-35","06-37","06-38","06-39","06-41","06-43","06-45","06-46","06-49","07-title","07-01","07-02","07-06","07-09","07-11","07-16","07-18","07-24","07-27","07-29","07-31","07-33","07-36","07-21","07-39","07-41","07-44","07-46","07-48","08-title","08-01","08-07","08-04","08-09","08-11","08-14","08-16","08-19","08-24","08-26","08-28","08-30","08-32","08-34","08-36","08-38","08-40","08-22","08-45","08-47","08-49","08-51","08-54","09-title","09-01","09-03","09-05","09-07","09-10","09-12","09-15","09-18","09-20","09-23","09-26","09-28","09-30","09-32","09-34","09-37","09-41","09-43","09-46","09-49","09-51","09-54","09-57","09-59","09-61","10-title","10-01","10-03","10-05","10-08","10-10"]}
\ No newline at end of file
+{
+	"package_version": 7,
+	"format": "usfm",
+	"generator": {
+		"name": "ts-desktop",
+		"build": "132"
+	},
+	"target_language": {
+		"name": "Kimboma",
+		"direction": "ltr",
+		"anglicized_name": "",
+		"region": "Africa",
+		"is_gateway_language": false,
+		"id": "ktu-x-kimboma"
+	},
+	"project": {
+		"id": "luk",
+		"name": "Luke"
+	},
+	"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-05",
+		"01-08",
+		"01-11",
+		"01-14",
+		"01-16",
+		"01-18",
+		"01-21",
+		"01-24",
+		"01-26",
+		"01-30",
+		"01-34",
+		"01-36",
+		"01-39",
+		"01-42",
+		"01-46",
+		"01-48",
+		"01-50",
+		"01-52",
+		"01-54",
+		"01-56",
+		"01-59",
+		"01-62",
+		"01-64",
+		"01-67",
+		"01-69",
+		"01-72",
+		"01-76",
+		"01-78",
+		"01-80",
+		"02-title",
+		"02-01",
+		"02-04",
+		"02-06",
+		"02-08",
+		"02-10",
+		"02-13",
+		"02-15",
+		"02-17",
+		"02-21",
+		"02-22",
+		"02-25",
+		"02-27",
+		"02-30",
+		"02-33",
+		"02-36",
+		"02-39",
+		"02-41",
+		"02-45",
+		"02-48",
+		"02-51",
+		"03-title",
+		"03-01",
+		"03-03",
+		"03-04",
+		"03-05",
+		"03-07",
+		"03-08",
+		"03-09",
+		"03-10",
+		"03-12",
+		"03-14",
+		"03-15",
+		"03-17",
+		"03-18",
+		"03-21",
+		"03-23",
+		"03-25",
+		"03-27",
+		"03-30",
+		"03-33",
+		"03-36",
+		"04-title",
+		"04-01",
+		"04-03",
+		"04-05",
+		"04-08",
+		"04-09",
+		"04-12",
+		"04-14",
+		"04-16",
+		"04-18",
+		"04-20",
+		"04-23",
+		"04-25",
+		"04-28",
+		"04-31",
+		"04-33",
+		"04-35",
+		"04-38",
+		"04-40",
+		"04-42",
+		"05-title",
+		"05-01",
+		"05-04",
+		"05-08",
+		"05-12",
+		"05-14",
+		"05-15",
+		"05-17",
+		"05-18",
+		"05-20",
+		"05-22",
+		"05-25",
+		"05-27",
+		"05-29",
+		"05-33",
+		"05-36",
+		"05-37",
+		"06-title",
+		"06-01",
+		"06-03",
+		"06-06",
+		"06-09",
+		"06-12",
+		"06-14",
+		"06-17",
+		"06-20",
+		"06-22",
+		"06-24",
+		"06-26",
+		"06-27",
+		"06-29",
+		"06-31",
+		"06-35",
+		"06-37",
+		"06-38",
+		"06-39",
+		"06-41",
+		"06-43",
+		"06-45",
+		"06-46",
+		"06-49",
+		"07-title",
+		"07-01",
+		"07-02",
+		"07-06",
+		"07-09",
+		"07-11",
+		"07-16",
+		"07-18",
+		"07-21",
+		"07-24",
+		"07-27",
+		"07-29",
+		"07-31",
+		"07-33",
+		"07-36",
+		"07-39",
+		"07-41",
+		"07-44",
+		"07-46",
+		"07-48",
+		"08-title",
+		"08-01",
+		"08-04",
+		"08-07",
+		"08-09",
+		"08-11",
+		"08-14",
+		"08-16",
+		"08-19",
+		"08-22",
+		"08-24",
+		"08-26",
+		"08-28",
+		"08-30",
+		"08-32",
+		"08-34",
+		"08-36",
+		"08-38",
+		"08-40",
+		"08-45",
+		"08-47",
+		"08-49",
+		"08-51",
+		"08-54",
+		"09-title",
+		"09-01",
+		"09-03",
+		"09-05",
+		"09-07",
+		"09-10",
+		"09-12",
+		"09-15",
+		"09-18",
+		"09-20",
+		"09-23",
+		"09-26",
+		"09-28",
+		"09-30",
+		"09-32",
+		"09-34",
+		"09-37",
+		"09-41",
+		"09-43",
+		"09-46",
+		"09-49",
+		"09-51",
+		"09-54",
+		"09-57",
+		"09-59",
+		"09-61",
+		"10-title",
+		"10-01",
+		"10-03",
+		"10-05",
+		"10-08",
+		"10-10"
+	]
+}
\ No newline at end of file