From 482fe6629f5f57e1f3d94c4641d8f8977a377fdd Mon Sep 17 00:00:00 2001 From: stewardd Date: Fri, 9 Mar 2018 21:11:02 +0200 Subject: [PATCH] Fri Mar 09 2018 21:11:02 GMT+0200 (South Africa Standard Time) --- 02/14.txt | 6 +- 02/16.txt | 6 +- 02/18.txt | 6 +- 02/20.txt | 6 +- 02/22.txt | 6 +- manifest.json | 164 ++++++++++++++++++++++++++------------------------ 6 files changed, 90 insertions(+), 104 deletions(-) diff --git a/02/14.txt b/02/14.txt index 97c9fc2..34e6315 100644 --- a/02/14.txt +++ b/02/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 \v 15 Kono nina zitu zilikene zini kunyasa kazo;Wina abo bamwi bakwete chakukoza kwituto za Balamu,yabaruti Balaki kusohela chisita,taliso habusu bwa bana ba Isilaele,kuti balye zilyo zama swaniso hape tende busangu.Muzila iswana, wina bamwi bakwatilile chaku koza kututo zamu Nicolaitani. -======= -\v 14 Nina zintu zilikene zinisatabeli: Kwina bamwi mukatikenu bakwatilile kwi tuto za Balaamu, uzo yabaluti Balaki kuzinda zisitataliso pili kubana ba Masilaele, kuti bawole kulya zilyo za chitabelo cha maswaniso imi nikuba basangu. \v 15 Mwinzila iswana, musina bamwi bakwatilile kwituto za Nicolaitans. ->>>>>>> c6facc89e4dfc755d88b2475c971f12ab4a6f187 +\v 14 Nina zintu zilikene zinisatabeli: Kwina bamwi mukatikenu bakwatilile kwi tuto za Balaamu, uzo yabaluti Balaki kuzinda zisitataliso pili kubana ba Masilaele, kuti bawole kulya zilyo za chitabelo cha maswaniso imi nikuba basangu. \v 15 Mwinzila iswana, musina bamwi bakwatilile kwituto za Nicolaitans. \ No newline at end of file diff --git a/02/16.txt b/02/16.txt index 6be6e0f..bc1fde1 100644 --- a/02/16.txt +++ b/02/16.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 16 \v 17 Mubake,Linuaho ; kwande yobulyo, kanihwele kwiza kwako, hape munize nilwe navo ikondo ni mukwale wina mu mulomo wangu.Musiye wina matwi atekeleze Luhuho chilu wamba kwi kereke. kozo yozunda,Kanize nimuhe kumaana awungwilwe,hape Kani muhe ibwe lituva lina izina ihya linoletwe hewulu lyebwe,izina lisezibitwe nuwumwina konji iye mwine yoli tambula -======= -\v 16 Mubakele zive, chobulyo, Haiba nimusa tendi bulyo, imi munibutule indwa ya kusazumizana nabo chamukwale wamulomo wangu. \v 17 Musiye abo bene mantwi bazuwe Luhuho chiluwamba kwi Keleke. Kwabo bakoma, kanihe bamwi kumanna apatitwe, imi kanihe inbwe lituba izina ihywa liñolitwe hebwe, izina ilyo kakwina nanga yenke wizi kono iye yolitambula.'''' ->>>>>>> c6facc89e4dfc755d88b2475c971f12ab4a6f187 +\v 16 Mubakele zive, chobulyo, Haiba nimusa tendi bulyo, imi munibutule indwa ya kusazumizana nabo chamukwale wamulomo wangu. \v 17 Musiye abo bene mantwi bazuwe Luhuho chiluwamba kwi Keleke. Kwabo bakoma, kanihe bamwi kumanna apatitwe, imi kanihe inbwe lituba izina ihywa liñolitwe hebwe, izina ilyo kakwina nanga yenke wizi kono iye yolitambula.'''' \ No newline at end of file diff --git a/02/18.txt b/02/18.txt index b3165a3..859dd54 100644 --- a/02/18.txt +++ b/02/18.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 18 \v 19 Kwi ingiloi lye kereke ya tayatira unole ; Aaa nji mazwi azwa kumwana we Ireeza,wina meso sina indimi yamulilo matende akwe abenya sina isipi yebroze; '' Nizi cho bapangi ; Irato lyako ni itumelo ni mitendo ni ikulo inde itundamena.Nizi hape choba pangi hahanu chihita chalwe tazi. -======= -\v 18 \v 19 Uñolele Iñiloi be Keleke ya Thyatira. Aa njimanzwi azwa ku Mwan'a Ireeza, uzo wina menso amunika sina malimi amuliloimi matende abenya sina makatulo abasizwe sinte. Nizi zimubapangi: Izwalo lyenu ni tumelo ni musebezi ni inkulo inde ilindila. Nizi kuti zintu zimubapangi linuhanu zihita zimubapangi kutanzi. ->>>>>>> c6facc89e4dfc755d88b2475c971f12ab4a6f187 +\v 18 \v 19 Uñolele Iñiloi be Keleke ya Thyatira. Aa njimanzwi azwa ku Mwan'a Ireeza, uzo wina menso amunika sina malimi amuliloimi matende abenya sina makatulo abasizwe sinte. Nizi zimubapangi: Izwalo lyenu ni tumelo ni musebezi ni inkulo inde ilindila. Nizi kuti zintu zimubapangi linuhanu zihita zimubapangi kutanzi. \ No newline at end of file diff --git a/02/20.txt b/02/20.txt index 5251382..636b74b 100644 --- a/02/20.txt +++ b/02/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 \v 21 Kono kwina zini kunyasa; wina ikulo inde ni mwanakazi Jezebele, iye yolisupa kuti muporofita. kono ketuto zakwe uchenga bahikana bangu kupanga busangu nikulya zilyo zachitabelo cha maswaniso Niba muhi inako kuti abake, kono kasuni kubaka kubusangu bwakwe. -======= -\v 20 \v 21 Kono ninazi zinilwisanisa namwe: Mubasilili uzo mwanakazi Jezebele, yolisumpa kuti mupolofita wamwana. Chituto zakwe abachengeleli bantu kutende buhule ni kulya zilyo zamatelo aziswaniso. Nibamuhi inako yakubakela chive, kono kasuni kubakela zive za muyendelo wakwe mubi. ->>>>>>> c6facc89e4dfc755d88b2475c971f12ab4a6f187 +\v 20 \v 21 Kono ninazi zinilwisanisa namwe: Mubasilili uzo mwanakazi Jezebele, yolisumpa kuti mupolofita wamwana. Chituto zakwe abachengeleli bantu kutende buhule ni kulya zilyo zamatelo aziswaniso. Nibamuhi inako yakubakela chive, kono kasuni kubakela zive za muyendelo wakwe mubi. \ No newline at end of file diff --git a/02/22.txt b/02/22.txt index 9cc6f3e..55f1c07 100644 --- a/02/22.txt +++ b/02/22.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 22 \v 23 Bone;Kani musohele hesasa nikulwala, nabo batenda naye busangu muma sukuluka makando,konji chini ba baka muzipangatu zakwe,Kani kave bana bakwe bafwe,imi zose ikereke kazi zibe kuti njeme yosakisiza kuzeza nikulo.Kani he wumwi ni wumwi kuya kamitendo yakwe. -======= -\v 22 \v 23 Mubone! Mu ni mulazike habulo chakulwala ->>>>>>> c6facc89e4dfc755d88b2475c971f12ab4a6f187 +\v 22 \v 23 Bone;Kani musohele hesasa nikulwala, nabo batenda naye busangu muma sukuluka makando,konji chini ba baka muzipangatu zakwe,Kani kave bana bakwe bafwe,imi zose ikereke kazi zibe kuti njeme yosakisiza kuzeza nikulo.Kani he wumwi ni wumwi kuya kamitendo yakwe. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 813eb5a..b4e13fd 100644 --- a/manifest.json +++ b/manifest.json @@ -43,7 +43,8 @@ "Christine N. Matomola", "Rose Lunza", "erestinah", - "Grace Sinvula" + "Grace Sinvula", + "stewardd" ], "finished_chunks": [ "01-01", @@ -54,6 +55,22 @@ "01-14", "01-17", "01-19", + "02-14", + "02-16", + "02-18", + "02-20", + "02-22", + "03-title", + "03-01", + "03-03", + "03-05", + "03-07", + "03-09", + "03-12", + "03-14", + "03-17", + "03-19", + "03-21", "04-title", "04-01", "04-04", @@ -84,25 +101,28 @@ "07-11", "07-13", "07-15", - "03-title", - "03-01", - "03-03", - "03-05", - "03-07", - "03-09", - "03-12", - "03-14", - "03-17", - "03-19", - "03-21", - "19-06", - "19-07", - "19-09", - "19-11", - "19-14", - "19-17", - "19-19", - "19-21", + "08-title", + "08-01", + "08-03", + "08-06", + "08-08", + "08-10", + "08-12", + "08-13", + "09-01", + "09-03", + "09-05", + "09-07", + "09-10", + "09-13", + "09-16", + "09-18", + "09-20", + "10-01", + "10-03", + "10-05", + "10-08", + "10-10", "11-title", "11-01", "11-03", @@ -114,6 +134,32 @@ "11-16", "11-18", "11-19", + "14-title", + "14-01", + "14-03", + "14-06", + "14-08", + "14-09", + "14-11", + "14-13", + "14-14", + "14-17", + "14-19", + "15-01", + "15-02", + "15-03", + "15-05", + "15-07", + "16-01", + "16-02", + "16-03", + "16-04", + "16-08", + "16-10", + "16-12", + "16-15", + "16-17", + "16-20", "17-title", "17-01", "17-03", @@ -125,79 +171,39 @@ "17-15", "17-16", "17-18", - "10-01", - "10-03", - "10-05", - "10-08", - "10-10", - "15-01", - "15-02", - "15-03", - "15-05", - "15-07", + "18-title", + "18-01", + "18-04", + "18-07", + "18-09", "18-11", "18-14", "18-15", "18-18", "18-21", "18-23", - "09-01", - "09-03", - "09-05", - "09-07", - "09-10", - "09-13", - "09-16", - "09-18", - "09-20", - "16-01", - "16-02", - "16-03", - "16-04", - "16-08", - "16-10", - "16-12", - "16-15", - "16-17", - "16-20", + "19-title", + "19-01", + "19-03", + "19-05", + "19-06", + "19-07", + "19-09", + "19-11", + "19-14", + "19-17", + "19-19", + "19-21", "21-01", "21-03", "21-05", "21-07", - "19-01", - "19-03", - "19-05", + "21-11", "21-14", "21-16", - "18-title", - "18-01", - "18-04", - "18-07", - "18-09", "21-18", "21-21", - "19-title", - "21-11", "21-23", - "21-26", - "08-title", - "08-01", - "08-03", - "08-06", - "08-08", - "08-10", - "08-12", - "08-13", - "14-title", - "14-01", - "14-03", - "14-06", - "14-08", - "14-09", - "14-11", - "14-13", - "14-14", - "14-17", - "14-19" + "21-26" ] } \ No newline at end of file