diff --git a/07/01.txt b/07/01.txt index a68cfe5..8465cfb 100644 --- a/07/01.txt +++ b/07/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 7 Ulwimbo lwakwa David, ulo aimbile Yahweh pa mashiwi ya kwa Cushi umwina Benjamini. \v 1 Yahweh Lesa wandi, muli nmwebo emo nkouba! mpususheni kuli bonse aba nkopempeka, kabili mpokololeni. \v 2 Pantu limbi bakonsantaulamo nge nkalamo, ukumputaula mutupimfya ukwabula nangu umo uwakundeta jku mutende. -======= -\c 7 Ulwimbo lwa bulanda ulwakwa Davidi, ulo ena aimbile kuli Yahweh palwa fyebo fyakwa Kushi umwina Benjamini. \v 1 Yahweh Lesa wandi, muli webo nebo emo nauba! Mpusussheni kuli abo bonse abasupila nebo, kabili mpokololeni. \v 2 Epali, nebo bantajanya ngafilya inkalamo icita, bansantaula nebo mutupimfya apatali nangu umo uulingile ukundeta ku kupokololwa. ->>>>>>> 6f93717a1a04bb11e78ccda9c12258a4a42c8e2c +\c 7 Ulwimbo lwa bulanda ulwakwa Davidi, ulo ena aimbile kuli Yahweh palwa fyebo fyakwa Kushi umwina Benjamini. \v 1 Yahweh Lesa wandi, muli webo nebo emo nauba! Mpusussheni kuli abo bonse abasupila nebo, kabili mpokololeni. \v 2 Epali, nebo bantajanya ngafilya inkalamo icita, bansantaula nebo mutupimfya apatali nangu umo uulingile ukundeta ku kupokololwa. \ No newline at end of file diff --git a/07/03.txt b/07/03.txt index 8d2d1d9..e5ab45c 100644 --- a/07/03.txt +++ b/07/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Yahweh Lesa wandi, nag ndisitile ici, kabili pa minwe yandi nga pali umulandu- \v 4 nga ndisitile ububi kuli wo, uwali no mutende nandi nangula bungwa bungwa ndicenene umulwani wandi apakubula umulandu, lyena umfweni ku mashiwi yandi -======= -\v 3 Yahweh Lesa wandi, nebo nga nacita ici, kabili pali umulandu pa maboko yandi- \v 4 ngacakuti nalicitile ububi kuli ena uyo uwali pa mutende kuli nebo, nangu nga nalipokolola umulwani wandi uyo uwamambile apakubula umulandu, eluntu mumfwe ifyebo fyandi. ->>>>>>> 6f93717a1a04bb11e78ccda9c12258a4a42c8e2c +\v 3 Yahweh Lesa wandi, nag ndicitile ici, kabili pa minwe yandi nga pali umulandu- \v 4 nga ndisitile ububi kuli wo, uwali no mutende nandi nangula bungwa bungwa ndicenene umulwani wandi apakubula umulandu, lyena umfweni ku mashiwi yandi \ No newline at end of file diff --git a/07/05.txt b/07/05.txt index 7280f7f..8426b55 100644 --- a/07/05.txt +++ b/07/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Kabili lekeni umulwani wandi alekupepeka umweo wandi, lekeni anyantaule ubumi bwandi panshi no kulaikala ubukankala bwandi mu lukungu. Selah -======= -\v 5 Eluntu muleke umulwani wandi asupile umweo wandi no ku nsanga; lekeni ena anyantaule umweo wandi pansh no kulalika ubucindami bwandi mu lukungu. Selah ->>>>>>> 6f93717a1a04bb11e78ccda9c12258a4a42c8e2c +\v 5 Kabili lekeni umulwani wandi alekupepeka umweo wandi, lekeni anyantaule ubumi bwandi panshi no kulaikala ubukankala bwandi mu lukungu. Selah \ No newline at end of file diff --git a/manifest.json b/manifest.json index 959b488..04eaa2a 100644 --- a/manifest.json +++ b/manifest.json @@ -41,38 +41,6 @@ "brian" ], "finished_chunks": [ - "07-title", - "14-title", - "15-title", - "15-01", - "15-03", - "15-04", - "16-title", - "16-01", - "16-04", - "16-05", - "16-07", - "16-09", - "16-11", - "17-title", - "17-01", - "17-03", - "17-04", - "17-06", - "17-08", - "17-11", - "17-13", - "17-15", - "18-title", - "20-title", - "20-01", - "22-title", - "22-01", - "22-03", - "22-06", - "22-09", - "22-11", - "22-14", "front-title", "01-title", "01-01", @@ -107,6 +75,10 @@ "06-03", "06-06", "06-08", + "07-title", + "07-01", + "07-03", + "07-05", "08-title", "08-01", "08-03", @@ -145,6 +117,37 @@ "13-01", "13-03", "13-05", + "14-title", + "15-title", + "15-01", + "15-03", + "15-04", + "16-title", + "16-01", + "16-04", + "16-05", + "16-07", + "16-09", + "16-11", + "17-title", + "17-01", + "17-03", + "17-04", + "17-06", + "17-08", + "17-11", + "17-13", + "17-15", + "18-title", + "20-title", + "20-01", + "22-title", + "22-01", + "22-03", + "22-06", + "22-09", + "22-11", + "22-14", "26-title", "26-01", "26-04",