diff --git a/31/06.txt b/31/06.txt index f9e2ec6..1de6917 100644 --- a/31/06.txt +++ b/31/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Elyo Mose abatumine bo mu nkondo, iknana limo ukufuma muli onse umutundu, pamo na Finehasi umwana mwaume wakwa Eleaza shimapepo, elo na fimo ifibombelo ukufuma umwashila mu ncende na mapenga ayakuti wo alebomfya mukulisha pakulabeshibisha. \v 7 Bo balwile na Midiani, nefyo Yaweh akonkomeshe Mose. Bo baipeye onse umwaume. \v 8 Bo baipeye ishamfumu sha Midiani na basheleko kuli bo bafwile. Evi, Rekemu, Zui,Hur, kabili Reba, shisano ishamfumu sha Midiani. Bo kabili baipeye Balaam umwana mwaume wakwa Beor, kulupanga. -======= -\v 6 Eliuntu Mose abatumine kubulwi, ikana ukufuma kuli cila mutundu, ukwampana pamo na finesi umwana mwauneme wakwa Eleasa shimapepo, elo aya alisendele nefipe ukufuma muncende yamushilo elo nefipe fimo ukufuma muncende yamushilo elo namapenga ayakulisha pakubeshibisha. \v 7 Balwile nabena Midia ukulingana nefyo Yahweh akonkomeshe Mose. baipeye abaume bonse. \v 8 Baipeye kumo nemfumu shabo shonse isha bena Midia'' elo Evi, Rekumu, Zur, Uri na Leba, imfumu shisano isha bena Midia. Kabili baipeye balamu umwana wakwa Beori, kulupanga. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 6 Elyo Mose abatumine bo mu nkondo, iknana limo ukufuma muli onse umutundu, pamo na Finehasi umwana mwaume wakwa Eleaza shimapepo, elo na fimo ifibombelo ukufuma umwashila mu ncende na mapenga ayakuti wo alebomfya mukulisha pakulabeshibisha. \v 7 Bo balwile na Midiani, nefyo Yaweh akonkomeshe Mose. Bo baipeye onse umwaume. \v 8 Bo baipeye ishamfumu sha Midiani na basheleko kuli bo bafwile. Evi, Rekemu, Zui,Hur, kabili Reba, shisano ishamfumu sha Midiani. Bo kabili baipeye Balaam umwana mwaume wakwa Beor, kulupanga. \ No newline at end of file diff --git a/31/09.txt b/31/09.txt index 61f365b..c757015 100644 --- a/31/09.txt +++ b/31/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Abashilika ba Isreali basende bankole ba namayo abena Midiani, abana babo, fyonse ukumi, ifitekwa, na fyonse, ifyabo ifipe. \v 10 Bo basendele ifi nga ifitapwa. Bo ba ocele yonse imisumba yabo umo bo baleikala na shonse ishabo inkambi. -======= -\v 9 Abashilika babena Israeli bapitile muli bunkole abanakashi baku Midia, nabana babo, nenama shabo, nengombe shabo shonse, elo nefyuma fyabo fyonse. Basendele ifi kukufyonaula. \v 10 Bailekoca nemisumba yabo umo balekwikala elo nashonse inkambi shabo. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 9 Abashilika ba Isreali basende bankole ba namayo abena Midiani, abana babo, fyonse ukumi, ifitekwa, na fyonse, ifyabo ifipe. \v 10 Bo basendele ifi nga ifitapwa. Bo ba ocele yonse imisumba yabo umo bo baleikala na shonse ishabo inkambi. \ No newline at end of file diff --git a/manifest.json b/manifest.json index ca658cb..3ef734a 100644 --- a/manifest.json +++ b/manifest.json @@ -372,6 +372,8 @@ "30-15", "31-title", "31-01", + "31-03", + "31-06", "31-25", "31-28", "31-30",