From 7dedb08fc9481ff8141557c5bdd324b6ff0ff87f Mon Sep 17 00:00:00 2001 From: kalaba howard Date: Wed, 26 Jan 2022 13:07:17 +0200 Subject: [PATCH] Wed Jan 26 2022 13:07:16 GMT+0200 (South Africa Standard Time) --- 26/23.txt | 6 +----- 26/26.txt | 6 +----- 26/28.txt | 6 +----- manifest.json | 4 ++++ 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/26/23.txt b/26/23.txt index 28e599c..6b47a3c 100644 --- a/26/23.txt +++ b/26/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 Imikowa yabana kufyalwa bakwa Issachali bali nyaba: ukupitila muli Tola, umukowa wabena Tola, ukupitla muli Puah umukowa wabena Pauh, \v 24 ukupitila muli Jashub, umukowa wabena Jashub, ukupitila muli Shimron, umukowa wabena Shimroni. \v 25 Iyi emikowa ya kwa Issachali, abali imbendwa 64,300 abaume. -======= -\v 23 Imikowa yalupwa lwakwa Issaka yali niyi: Ukupitila muli Tola, umukowa wabena Tola, ukupitila muli Pua, umukowa wabena Pua, \v 24 ukupitila muli Yashub, umukowa wabena Yashub, ukupitila muli Shimuroni, umukowa wabena Shimuroni. \v 25 Iyi emikowa yakwa Isaaka, 64,300 abaume abapandelwe. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 23 Imikowa yabana kufyalwa bakwa Issachali bali nyaba: ukupitila muli Tola, umukowa wabena Tola, ukupitla muli Puah umukowa wabena Pauh, \v 24 ukupitila muli Jashub, umukowa wabena Jashub, ukupitila muli Shimron, umukowa wabena Shimroni. \v 25 Iyi emikowa ya kwa Issachali, abali imbendwa 64,300 abaume. \ No newline at end of file diff --git a/26/26.txt b/26/26.txt index 5d0ca17..028e3c4 100644 --- a/26/26.txt +++ b/26/26.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 26 Imikowa yabana kufyalwa bakwa Zebulini, bali nyaba: ukupitla muli Sered, umukowa wabena Seredi, ukupitla muli Elon, umukowa wabena Eloni, ukupitila muli Jahreel, umukowa wabena Jareeli. \v 27 Iyi eya imikowa wakwa Zebuluni, aba impendwa 60,500 abaume. -======= -\v 26 Imikowa yalupwa lwakwa Zebuluni yali ifi: Ukupitila muli Seredi, umukowa wakwa Seredi, ukupitila muli Eloni, umukowa wabena Eloni, ukupitila muli Yalele, umukowa wabena Yalele, \v 27 iyi emikowa yalupwa lwakwa Zebuluni, 60,500 abaume abapendelwe. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 26 Imikowa yabana kufyalwa bakwa Zebulini, bali nyaba: ukupitla muli Sered, umukowa wabena Seredi, ukupitla muli Elon, umukowa wabena Eloni, ukupitila muli Jahreel, umukowa wabena Jareeli. \v 27 Iyi eya imikowa wakwa Zebuluni, aba impendwa 60,500 abaume. \ No newline at end of file diff --git a/26/28.txt b/26/28.txt index 89edcf6..bc4dfc8 100644 --- a/26/28.txt +++ b/26/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 Imikowa yabana kufyalwa bakwa Yosefe yali ni Manasseh na Epraimu. \v 29 Abana kufyalwa bakwa Manasseh bali nyaba: ukupitila muli Makir, Umukowa waben Makir, (Makir ewali wishi wakwa Gilead), ukupitila muli Gilead umukowa wabena Gilead, umukowa wabena Gileadi. -======= -\v 28 Imikowa yalupwa lwakwa Yosefu bali ni Manase na Ephraim. \v 29 Ulupwa lwakwa Manase lwali ifi: Ukupitila muli Maki, umukowa wabena Maki (Maki ewali wishi wakwa Gileadi), ukupitila muli Gileadi, umukowa wabena Gileadi. ->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0 +\v 28 Imikowa yabana kufyalwa bakwa Yosefe yali ni Manasseh na Epraimu. \v 29 Abana kufyalwa bakwa Manasseh bali nyaba: ukupitila muli Makir, Umukowa waben Makir, (Makir ewali wishi wakwa Gilead), ukupitila muli Gilead umukowa wabena Gilead, umukowa wabena Gileadi. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 77887eb..1dc7b93 100644 --- a/manifest.json +++ b/manifest.json @@ -325,6 +325,10 @@ "23-28", "24-title", "26-title", + "26-23", + "26-26", + "26-28", + "26-30", "26-33", "26-35", "26-38",