Sat Jul 11 2020 08:34:10 GMT+0200 (South Africa Standard Time)

01/01.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \c 1 \v 1 Paulu, mutumwa wa kilisito jesu kwendelama amalaile a leza mugwasyi wesu o kilisito jesu mulangizi wesu,  \v 2 kuli Timoti, mwana weni weni mulushomo: luse, lwengelelo, olumuno luzwa kuli leza tata o kilisito jesu mwami  wesu.
+=======
+\c 1 \v 1 Paulu mutumwa wa kilisitu Jesu kwendelanya amalailile a leza mugwasyi wesu o kilisitu Jesu mulangilizi wesu,  \v 2 kuli Timoti, mwana weni weni mulushomo, luse, lwengelelo, olumuno luzwa kuli leza tata o kilisitu Jesu mwami wesu.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

01/03.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \v 3 Mbonya mbuli mbundakakulailila cindi nindali kuyobuya ku Masedoniya, ukale mu Efesusi mukuti ulesye bamwi bantu bataisyi bumbi.  \v 4 Nikuba kuswilizya twano buyo okulibanda mazina amazyalane atakwe magolelo.
+=======
+\v 3 Mbonya mbuli mbundakakulailila ciindi nindati kuyobuya ku Masedoniya, ukale mu Epesasi mukuti ulesye bamwi bantu kabataisyi, bumbi.  \v 4 Nikuba kuswilizya twaano buyo okulibanda mazina amazyalane atakwe magolelo.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

01/05.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \v 5 Iino muzeezo wokulailila ngoluyando luzwa kumoyo usalala, kuyeeya kululeme, o lushomo lweni lweni.  \v 6 Bamwi bantu baliswekide kuzwa kuli ezi zintu nibakacili kukazyana kobufubafuba.  \v 7 Bayanda kuba bayisya mulawo, pele kabatazi nzibambola nikuba ezyo nzibazumina.  \v 8 Pele tulizi kuti mulawo ulikabotu na kuti umwi waubelesya mbuwelede.
+=======
+\v 5 Iino muzezo wokulalila ngo luyando lwazwa kumoyo usalala, kuyeya kululeme, o lushomo a lweni lweni.  \v 6 Bamwi bantu baliswekide kuzwa kuli ezi zintu nibakacilila kukazyanya kobufubafuba.   \v 7 Bayanda kuba baisya mulawo, pele kabatazi nzibaboola nikuba ezyo nzibazumina.   \v 8 Pele tulizi kuti mulawo ulikabotu na umwi waubelesya mbuwelede.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

01/09.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \v 9 Tulizi namu, kuti mulawo tubambilidwe oyo ululeme, pele abo bautyola abasigama, batambi leza abasimucita zibi, okuli abo batasalali basofwede, abo bajaya maisi amanyina ngwabajayi,  \v 10 ngwabasibwamu, ngwaabo basola kucita nkwela mwalumi kumwaluminyina o mwanakazi ku mwanakazi nyina, abo basikuba bantunyina okucita buzike, ababeji, eezyo zimwi zitendelani kunjisyo mbotu.  \v 11 Njisyo ezi zilajanwa mu makani mabotu obulemu amba zya leza ulemekwa wakandipa ngawo kuti ndaiisye.
+=======
+\v 9 Tulizi namu, kuti mulawo tubambilidwe oyo ululeme, pele abo batyola abasigama, batakombi leza abasimucita zibi, akuli abo batasalali basofwede, abo bajaya maisi amanyina ngwabajayi, \v 10 ngwabasibwamu, ngwabo bacita nkwela kubalumi nyina a banakazi ku mwanakazi nyina, abo basikuba bantu nyina akubacita buzike, abajayi.  \v 11 Njiisyo ezi zilajanwa mumakani mabotu obulemu ambi zya leza ulemekwa wakandipa ngawo kuti ndisiye.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

01/12.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \v 12 Ndilumba kilisito Jesu mwami wesu, wakandipa nguzu, nkambo wakandishoma okundipa mulimo wokumubelekela.  \v 13 Ndali kumusampola, kumupenzya okumutukila. Pele ndaka tambula lweengelelo nkambo ndalikuzicita ezi nketana kushoma.  \v 14 Ambi luse lo mwami wesu lwakaba lunji mponya wakandipa olushomo o luyando luli muli kilisito Jesu.
+=======
+\v 12 Ndilumba kilisitu Jesu mwami wandipa nguzu, nkaambo wakandishoma okundipa mulimo wokumubelekela.  \v 13 Ndili mukumusampola, kumupenzya okumutukila. Pele ndakatambula lwengelelo nkambo ndalikuzicita ezi nketana kushoma.  \v 14 Ambi luse lo mwami wesu lwakaba lunji mponya wakandipa olushomo o luyando luli muli kilisiro Jesu.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

01/15.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \v 15 Majwi aelede kutambulwa okushomwa ngaaya ngokuti kilisito Jesu wakaza munyika kuzofutula basizibi.  Ndime mubi wiindilila kuliaba.  \v 16 Pele muli aka kaambo wakandibede oluse, mukuti muli mebo, ndesizibi winda beense, kilisitu Jesu abonye lwengelelo lwakwe lupati.  Wakacicita ecikuti ube ngo mukozyano kuli abo bayomushoma mukuti bakajane buumi butamani.  \v 17 Iino kumwami wecindi cense, kali nguwe  alike, utaboneki, ngo leza alike, alemekwe okupegwa bulemu mane kukabe kutamani. Akube namuya.
+=======
+\v 15 Majwi aelede kutambulwa akushomwa ngaya ngokuti kilisito Jesu wakaza munyika kuzofutula basizibi.  Ndime mubi windilila kuliaba.   \v 16 Pele muli aka kaambo wakandibedaoluse, mukuti muli mebo, ndesizibi wiinda  beense, kilisito Jesu abonye lwengelelo lwakwe lupati. Wakacicita eci kuti be ngo mukozyano kuli abo bayomushoma mukuti bakajane buumi butamani.  \v 17 Iino ku mwami wecindi ceense, kali nguwe alike utaboneki, ngo leza alike, alemekwe okupegwa bulemu mane kukabe kutamani. Akube namuya.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

01/18.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \v 18 Ndikupa malailile aya, Timoti, mwanangu, kwendelana amajwi abasinsimi ngibakambola kwamba zyako, mukuti abe zilwanyo nzyolwanya nkondo mbotu, \v 19 Ujatisye lushomo okuba omoyo utakwe kaambo.  Mukutaswilila eci, bamwi lushomo lwabo lwakanyonyoka.  \v 20 Muli abo kuli Haimeneyusi o Alekizanda, abo mbindaaba kuli satani mukuti baisigwa kutasampola limbi leza.
+=======
+\v 18 Ndikupa malailile aya, Timoti, mwanangu, kwendelanya amajwi abasinsimi ngibakambola kwamba zyako, mukuti abe zilwanyo zyalwanya nkondo mbotu.  \v 19 Ujatisye lushomo okuba amoyo utakwe kaambo.  Mukutaswilila eci. Bamwi lushomo lwabo lwakanyonyoka, \v 20 muli aba kuli Haimeneyusi o Alekizanda, abo mbindamba kuli satani mukuti baisigwe kutasampola limbi leza.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

02/01.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \c 2 \v 1 Ino kusaanguna ndakumbila kuti, zikumbizyo nkombyo kwiima akati okupa milumbo kube kubantu beense.  \v 2 Kubami abo hali mubwendelezi kucita kuti tukonzye kukala mulumuno mububotu omubulemu.  \v 3 Eci ncibotu ape citambulika kubusyu bwa leza mufutuli wesu.  \v 4 Uyanda bantu beense kuti bakafutulwe okuti basike kuluzibo lwamasimpe.
+=======
+\c 2 \v 1 Iino kusanguna, ndakumbila kuti zikumbizyo nkombyo, kwiima akati okupa milumbo kube kubantu beense.  \v 2 Kubami abo kuti mubwendelezi kucita kuti tukonzye kukala mulumuno mububotu omubulemu.  \v 3 Eci ncibotu ape citambulike kubusyu bwa leza mufutuli wesu.  \v 4 Uyanda bantu beense kuti bakafutululwe okuti basike kuluzibo lwamasimpe.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

02/05.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \v 5 Nkambo kuli leza womwi, ape kuli simwiima akati ka leza abantu, muntu kilisito Jesu. \v 6 Wakalipa mweni lwakwe kuli anunune bantu beense, mbuli bumboni acindi celede. \v 7 Akambo kaaya mokanze wakandibika kuba mwendelezi o muntumwa ndili kwaamba masipe, nsilimukweni- omwiyi wabasimasi mulushomo omumasimpe.
+=======
+\v 5 Nkaambo kuli leza womwi, ape kuli simwimi akati kaleza abantu, ngu Jesu kilisito.  \v 6 Wakalipa mweni lwakwe kuti anunune bantu beense, mbuli bumboni acindi celede.  \v 7 Akaambo  kaya makanze wakandibika kuba mwendelezi o muntumwa ndili kwamba masimpe, nsilimukweni' omwiyi wabasimasi mulushomo omumasimpe.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

02/08.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \v 8 Mponya, ndiyanda balumi mucibaka cili cense kuti bakombe amanza anyamwidwe omoyo usalala kakutakwe kunyema nikuba kukazyana.  \v 9 Munzila njonyina, banakazi balelede kuzwata zibiya zyelelede, cobulemu okulibombya nikuba kugama kuzwata zibiya zidula nikuba tuwenge twe ngolide na twengale.  \v 10 Kono baleelede kulibotya emilimo mibotu mboonya mbubeelede banakazi bakilisito.
+=======
+\v 8 Mponya ndiyanda balumi mucibaka ciliceense kuti bakombe amanza anyamwidwe omoyo usalala kakutakwe kunyema nikuba kukazyana.  \v 9 Munzila njiyonyina, banakazi beelede kuzwata zibya zyeeleede, cobulemu okulibamba lwabo kutamba kulyoosa masusu mukulibonya nikuba kugama kuzwata zibya zidula, nikuba tusege twa ngoide na twengae,  \v 10 kono baleelede kulibotya emilimo mibotu mbonyina mbubelede banakazi bakilisitu.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

02/11.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \v 11 Mwanakazi nibaisigwa balelede kulibatamika okuswilisisya.  \v 12 Nsizumizya mwanakazi kuyiisya nikuba kubalanga a mutwe baalumi ndakaka, pele kanga kaumwinide buyo.
+=======
+\v 11 Mwanakazi nibaisigwa balelede kulibatamika okuswililisya.  \v 12 Nsizumizya mwanakazi kuyisya nikuba kubalanga amutwe balumi, pele kunga kaumwinide buyo.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

02/13.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \v 13 Adamu nguwakasanguna kulengwa, mponya Eva.  \v 14 Adamu tainsi nguwakaenenwa, pele mwanakazi nguwakaenenwa ambi oku sotoka malailile aa leza.  \v 15 Nikuba namu, mwanakazi uyofutulwa kwindila mukuzyala bana, kuti wajatisya mulushomo o muluyando o mukusalala kumizezo.
+=======
+\v 13 Adamu ngowakasanguna kulengwa, mponya Eva.  \v 14 Adamu tainsi nguwakaenenwa, pele mwanakazi nguwakaenenwa ambi oku sotoka malailile a leza.  \v 15 Nikuba namu, mwanakazi uyofulwa mwida mukuzyala bana, kuti na wajatisya mulushomo o muluyando o mukusalala kumizezo.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

03/01.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \c 3 \v 1 Ino aka kambyo nkamasimpe, kuti na umwi uyanda musebezi wobwendelezi, ulayanda musebezi mubotu.  \v 2 Nkambo kako mwendelezi welede kubula kampenda. Welede kuba ukwete mwanakazi womwi. Welede kuba ulibatamika, wamano wendelezya kabotu okutambula kabotu beenzu, welelede kakonzya kuisya.  \v 3 taelede kuba mukolwi na sinkondo, pele kali mubombe moyo, siluumuno. Taelede kuba simuyanda mali.
+=======
+\c 3 \v 1 Lino aka kambo kamasimpe, kuti naumwi uyanda musebezi wabwendelezi, ulayanda musebezi muboyu.  \v 2 Nkambo kako mwendelezi weelede kubula kampenda. Weelede kuba ukwete mwanakazi womwi. Weleede kuba ulibatamika, wamana weendelezya kabotu okutambula kabotu beenzu akukonzya kuisya.  Kali mubombe moyo, silumuno. \v 3 Taeelede kuba simuyanda mali.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

03/04.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \v 4 Welede kuba muntu uzi kulela kabotu mukwasyi wakwe, ape weelede kubona kuti bana bakwe balamumvwida kukumulemeka munzila zyeense. \v 5 Nkaambo kuti na muntu katazi kulele kabotu mukwasyi wakwe, ino inga ulakonzya buti kwendelezya mbungana ya leza.
+=======
+\v 4 Weelede kuba muntu uzi kulela kabotu mukwasyi wakwe, ape weelede kubona kuti bana bakwe balamuvwida okumulemeka munzila zyeense.  \v 5 Nkambo kuti na muntu katazi kulela kabotu mukwasyi wakwe, ino inga ulakonzya buti kwendelezya mbungano ya leza.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

03/06.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \v 6 Teelede kuba wakasanduka inawa, mukucita kuti atazuli kulisumpula nkaambo ulawida mumasukusyo mbuli satani.  \v 7 Welede kuti ape kazibidwe empuwo mbotu kubantu bokunze, mukuti we atasampaulwi okuwida mukakole ka satani.
+=======
+\v 6 Taelede kuba wasanduka inawa, mukucita kuti atazuli kulisumpula nkambo ulawida mumasukusyo mbuli satani.  \v 7 Welede kuti ape kazibidwe empuwo mbotu kubantu bokunze, mukuti we atasampaulwi okuwida mukakole ka satani.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

03/08.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 \v 8 \v 9 \v 10 Munzila njonyina, ambabo bakutausi mumbungano beelede kuba mbonya, bobulemu, batabi bendimi zyobile.  Bataindilizyi kunywa zikola nikuba kuba busyacivule mwangu.  Pele beelede kujatisya makani aasisidwe ayo ngitushoma amoyo usalala.  Belede kulangililwa cokusanguna, mponya belede kubelka nkambo tabakwe butongo.
+=======
+\v 8 Munzila njoyina, ababo bakutausi mumbungano beelede kuba mbonya, bobulemu, batabi bendimi zyobilo. Batanwi zikola nikuba kuba basyacivule mwangu.  \v 9 Pele balelede kujatisya makani asisidwe ayo ngitushoma amoyo usalala.  \v 10 Balelede kulangilwa cokusanguna mponya balelede kubeleka kambo tabakwe butongo.
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

03/11.txt

@@ -0,0 +1 @@
+\v 11 Munzila njiyonyina, ambabo banakazi babo belede kuba boulemu, batatamikizyi bamwi kano balibatamika okushomeka muzintu zyeense.  \v 12 Bakutausi beelede kuba o mwanakazi omwi, balela kabotu bana babo okubamba kabotu mikwasyi yabo.  \v 13 Nkaambo abo bakabeleka kabotu mumbungano balijanina cimo cibotu  okusima muku aamba zyolusyomo ndotujesi muli kilisito jesu.

03/14.txt

@@ -0,0 +1 @@
+\v 14 Ndalemba ezi zintu kuli nywebo ndiyeya kuzoza kulinywebo cokufwambana.  \v 15 Kuti na ndacedwa, ndilemba kuti muzibe bwakulibamba munganda ya leza, eyo nembungano ipona yamwami leza,cisiko camasimpe.

03/16.txt

@@ -0,0 +1 @@
+\v 16 Twense tulazumina kuti maseseke obukombi bwesu mbupati.  we wakabonwa mubilili wakambwa kuti mululami o muuya usalala, wakabonwa abangelo, wakakomokwa akati kemisyobo yeense, wakashomwa abantu munyika. wakatolwa kujulu mubulemu.

04/01.txt

@@ -0,0 +1 @@
+\c 4 \v 1 Ncobeni muuya usalala ulamba kuti cindi ciza bamwi bayosiya lushomo okuyogama kuswilila njisyo zyobubeji zzwa kumyuuya mibi.  \v 2 Njisyo zyabasikupa amenso babeji, bali emyoyo yakalibala yakadintwa acisimbi cipiya.

04/title.txt

@@ -0,0 +1 @@
+Cipati ca 4

front/title.txt

@@ -1 +1,5 @@
+<<<<<<< HEAD
 2 Timoti
+=======
+1 Timoti
+>>>>>>> 744125c2c44c0afd9f5bd08389cfbe48f0f83567

manifest.json

@@ -36,24 +36,13 @@
 		"siachinene mary"
 	],
 	"finished_chunks": [
-		"front-title",
 		"01-title",
-		"01-01",
-		"01-03",
-		"01-05",
-		"01-09",
-		"01-12",
-		"01-15",
-		"01-18",
 		"02-title",
-		"02-01",
-		"02-05",
-		"02-08",
-		"02-11",
-		"02-13",
 		"03-title",
-		"03-01",
-		"03-04",
-		"03-06"
+		"03-11",
+		"03-14",
+		"03-16",
+		"04-title",
+		"04-01"
 	]
 }