From 263464bb3881519c4d17e843e2c4f57174d637d9 Mon Sep 17 00:00:00 2001 From: kalaba howard Date: Wed, 26 Jan 2022 15:31:36 +0200 Subject: [PATCH] Wed Jan 26 2022 15:31:35 GMT+0200 (South Africa Standard Time) --- 24/23.txt | 6 +----- 24/25.txt | 6 +----- 25/01.txt | 6 +----- 25/04.txt | 6 +----- 25/06.txt | 6 +----- 25/08.txt | 6 +----- 25/title.txt | 6 +----- manifest.json | 7 +++++++ 8 files changed, 14 insertions(+), 35 deletions(-) diff --git a/24/23.txt b/24/23.txt index c8b6da2..507c0bb 100644 --- a/24/23.txt +++ b/24/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 Elyo Balaam ambile ubusesemo bwakulekelesha. Asosele, ''Owe ninani ukapusuka iilyo Lesa akacita ifi? \v 24 Ifyombo fikafuma ukufma ku lulamba lwa Kitimu, bakasansa Assiri kabili na Ebere, nomba nabo bene bakaloba.'' -======= -\v 23 Eluntu Balamu atampile ubusesemo bwakwe ubwakulekelesha. Alandile ati, ''Owe! Ninani uukapusuka uluntu Lesa acita ifi? \v 24 Ifyombo filinokwisa ukufuma kululamba lwa Kitimu; balinokusansa abena Ashuri elo alinokucimfya Ebere, lelo bali, nokupelekesha mubonaushi nabobene.'' ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 23 Elyo Balaam ambile ubusesemo bwakulekelesha. Asosele, ''Owe ninani ukapusuka iilyo Lesa akacita ifi? \v 24 Ifyombo fikafuma ukufma ku lulamba lwa Kitimu, bakasansa Assiri kabili na Ebere, nomba nabo bene bakaloba.'' \ No newline at end of file diff --git a/24/25.txt b/24/25.txt index 57830f8..2cb642f 100644 --- a/24/25.txt +++ b/24/25.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 25 Eico Balaam alimine kabili nokuya. Ena abwelele kumushi wakwe, kabili Balaki nao efyo aile. -======= -\v 25 Eluntu Balamu aimine nokuya. Abwelele ku ng'anda yakwe, na Balaki nao aile kumbi. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 25 Eico Balaam alimine kabili nokuya. Ena abwelele kumushi wakwe, kabili Balaki nao efyo aile. \ No newline at end of file diff --git a/25/01.txt b/25/01.txt index e00aa64..6120612 100644 --- a/25/01.txt +++ b/25/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 25 \v 1 Israel yaliokele mu shihim kabili bashitata batampile abene na banamayo ba mu moab. \v 2 Ico ama moabites bakutile abantu kufye lambo ikuli tu Lesa twabo. Eico abantu balilile noku kumkwila tulesa twama moabitites. -======= -\c 25 \v 1 Israeli alikele mu Shittimu, elo nabaume balitampile ubulalelale abene kubanakashi bakuMoab, \v 2 pantu ebena Moab balekuta abantu ukupela ubulambo kuli tulesa twabo. Nabantu balile elo balifukeme panshi kuli tulewsa twabena Moab. \v 3 Abaume bamu Israeli baliilundile mukushinshimuna Baali waku Peor, elo necipyu cakwa Yahweh caliponene pali Israeli. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\c 25 \v 3 \v 1 Israel yaliokele mu shihim kabili bashitata batampile abene na banamayo ba mu moab. \v 2 Ico ama moabites bakutile abantu kufye lambo ikuli tu Lesa twabo. Eico abantu balilile noku kumkwila tulesa twama moabitites. \ No newline at end of file diff --git a/25/04.txt b/25/04.txt index 711b2d6..302699d 100644 --- a/25/04.txt +++ b/25/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 YAhweh walandile kuli Mose, ''IPaya shonse intungulushi sha bantu kabili ishikulike pamukulu pa cinso candi pakuba sebanya bo mukakabuba, pakuti ubukali bwakufulwa kwabo kwingafumishiwa ukufuma kuli Isreali.'' \v 5 Eco Mose walicitile ku ntungulushi shabena Isreali, ''Onse muli mwe afwile ukwipaya abantu bakwe abo aba kumika mukupepa Baali wakwa Pear.'' -======= -\v 4 Yahweh alandile kuli Mose ati, ''Ipaya shonse intungulushi shabantu elo ubakulikile pamulu kuli nebo ukubalanga pakasuba, akatandemono, pakwebati, icipyu cabukali bwandi cingafumapo pali Israeli.'' \v 5 Eico Mose alandile kuntungulushi shabena Israeli, ''Bonsefye cilaumo afwile ukwipaya abantu abalikuilunda mukushinshimuna Baali waku Peor.'' ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 4 YAhweh walandile kuli Mose, ''IPaya shonse intungulushi sha bantu kabili ishikulike pamukulu pa cinso candi pakuba sebanya bo mukakabuba, pakuti ubukali bwakufulwa kwabo kwingafumishiwa ukufuma kuli Isreali.'' \v 5 Eco Mose walicitile ku ntungulushi shabena Isreali, ''Onse muli mwe afwile ukwipaya abantu bakwe abo aba kumika mukupepa Baali wakwa Pear.'' \ No newline at end of file diff --git a/25/06.txt b/25/06.txt index ac87ef4..a37678c 100644 --- a/25/06.txt +++ b/25/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Elo umo pa baume pa bana baume bakwa Isreali waishile kabili nokuleta pakati kalupwa lwakwe namayo uwmina midiani. Ifi fyacitikile mumenso yakwa Mosena pa mushumba wa Isreali, ulo balikulosha pa mwinshi we tenti lyakukumaninamo. \v 7 Ulo Phinehas umwana mwaume wakwa Eleaza umwana mwaume waume wakwa Aaroni shimapepo, wamwene ukuti, alimine ukufuma pakati kebumba kabi li walibuklile ifumo muminwe yakwe. -======= -\v 6 Eluntu umwaume umo uwa mubana baume bakwa Isareli alishile elo aliletele abamulupwa lwakwe umwanakashi umwina Midian. Ici calicitikile pamenso yakwa Mose elo nebumba lyonse ilya bantu baku Israeli, ulo bacili balikulila pamwinshi wetenti lyakukumaninamo. \v 7 Uluntu Phinehas umwana mwumme wakwa Eliaza umwana mwaume wakwa Aaron shimapepo, abwene cilya alifumune mwibumba elo alibulile nomusumbo muminwe yakwe. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 6 Elo umo pa baume pa bana baume bakwa Isreali waishile kabili nokuleta pakati kalupwa lwakwe namayo uwmina midiani. Ifi fyacitikile mumenso yakwa Mosena pa mushumba wa Isreali, ulo balikulosha pa mwinshi we tenti lyakukumaninamo. \v 7 Ulo Phinehas umwana mwaume wakwa Eleaza umwana mwaume waume wakwa Aaroni shimapepo, wamwene ukuti, alimine ukufuma pakati kebumba kabi li walibuklile ifumo muminwe yakwe. \ No newline at end of file diff --git a/25/08.txt b/25/08.txt index 5cd19f8..01b71a2 100644 --- a/25/08.txt +++ b/25/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Alikonkele umwaume umwina Israel mwi hema kabili alilashile bonse ukupusha mumibili yabo, bonse umwaume waku Israel' no mwanakashi. Sico icikuko ico Lesa atumine pabantu ba Israel caliminine. \v 9 Bonse abafwile ku chikuko bali twenty four thousand mu mpendwa. -======= -\v 8 Alimukonkele umwaume wamubena Israeli mwitenti elo alipushishemo bonse umusumbo, mumibili yabo, bonse umwaume elo no mwanakashi. icikuko ico Lesa atumine pabena Israeli calipwile. \v 9 Abo abafwile kucikuko bali amakana yane mumpendwa. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 8 Alikonkele umwaume umwina Israel mwi hema kabili alilashile bonse ukupusha mumibili yabo, bonse umwaume waku Israel' no mwanakashi. Sico icikuko ico Lesa atumine pabantu ba Israel caliminine. \v 9 Bonse abafwile ku chikuko bali twenty four thousand mu mpendwa. \ No newline at end of file diff --git a/25/title.txt b/25/title.txt index bc45502..bccb889 100644 --- a/25/title.txt +++ b/25/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Impendwa 25 -======= -Icipandwa 25 ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +Icipandwa 25 \ No newline at end of file diff --git a/manifest.json b/manifest.json index a63816f..4fc32ec 100644 --- a/manifest.json +++ b/manifest.json @@ -335,6 +335,13 @@ "24-17", "24-18", "24-20", + "24-21", + "24-23", + "24-25", + "25-title", + "25-01", + "25-04", + "25-06", "26-title", "26-01", "26-03",