From 7c5c2a67a8716128104fdd0e79d6c00fe9bac498 Mon Sep 17 00:00:00 2001 From: jessy_brown Date: Sat, 4 Jul 2020 12:44:21 +0200 Subject: [PATCH] Sat Jul 04 2020 12:44:21 GMT+0200 (South Africa Standard Time) --- 08/50.txt | 6 +----- 08/52.txt | 6 +----- 08/54.txt | 6 +----- 08/57.txt | 6 +----- 09/title.txt | 6 +----- manifest.json | 6 ++++++ 6 files changed, 11 insertions(+), 25 deletions(-) diff --git a/08/50.txt b/08/50.txt index 678bae0..9857539 100644 --- a/08/50.txt +++ b/08/50.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 50 Nufuna lini ulemelelo wangu; pali umozi ofunafuna na kuweluza. \v 51 Chendi,chendi, nunena kwa mweo,ngati munthu osunga mau yangu,akaone lini imfwa." -======= -\v 50 \v 51 Nufuna llini ulemelelo wangu; pali m'mozi ofuna, pali umozi ofuna funa nakuweluza. Zonna, zoona, nikuti kwa mweo, ngati aliyense osunga mau bangu, akaone lini infwa.'' ->>>>>>> 36a080f1bf55b8f5850c311d3048dba161f2ba35 +\v 50 Nufuna lini ulemelelo wangu; pali umozi ofunafuna na kuweluza. \v 51 Chendi,chendi, nunena kwa mweo,ngati munthu osunga mau yangu,akaone lini imfwa." \ No newline at end of file diff --git a/08/52.txt b/08/52.txt index 80831e6..fce83b7 100644 --- a/08/52.txt +++ b/08/52.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 52 Ayuda eciti kwa eve, "Lomba tuziba kuti uli na cibanda.Abraham na neneri becifwa; koma weo unena kuti, 'ngati munthu akasunge mau yangu,akafwe lini.' \v 53 Ndiwe lini opambana Atata basu Abraham echifwa,ungabapambane weo? Aneneri becifwa. Uzipanga kuti ndiwe bani?" -======= -\v 52 \v 53 Ayuda emuyankha kuti, ''Lomba taziba kuti uli na demoni. Abrahamu na aneneli ecifwa; koma mukuti, ' aliyense osunga mau bangu akalabe lini imfwa. Niwe lini opambana Atata basu Abrahamu ecifwa, Ni teto?'' Aneneli ecifwa. Uzipanga kuti niwebani weo?'' ->>>>>>> 36a080f1bf55b8f5850c311d3048dba161f2ba35 +\v 52 Ayuda eciti kwa eve, "Lomba tuziba kuti uli na cibanda.Abraham na neneri becifwa; koma weo unena kuti, 'ngati munthu akasunge mau yangu,akafwe lini.' \v 53 Ndiwe lini opambana Atata basu Abraham echifwa,ungabapambane weo? Aneneri becifwa. Uzipanga kuti ndiwe bani?" \ No newline at end of file diff --git a/08/54.txt b/08/54.txt index 30abfb0..2cc1de3 100644 --- a/08/54.txt +++ b/08/54.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 54 Yesu eyankha, "ngati nuzikweza neka, ulemelelo wangu ni wa tyala; ni Atata oni kweza neo_pali ula mukuti ni Mulungu wanu. \v 55 Muliye muzibe eve,koma numuziba neo. ngati ninga labile, 'kuti numuziba lini; Ningabe kwati nimweo, wa wenye. Koma, numuziba ndipo nu sunga mau yake. \v 56 Awisi banu Abraham bekondwela pakuona siku langu; beyiona ndipo bekhondwela." -======= -\v 54 \v 55 \v 56 Yesu eyankha, Ngati nuzikweza neka, kuzikweza kwangu kuliye phindu; ni Atata bangu onikweza - wamukuti ndiye Atata banu. Mukaliyo muziba, koma numuziba. Kuti nalabila, numuziba lini,' ningankhale ngani nimweo, wa wenye.Caico Numuziba nusunga na mau bake. Atata abnu Abrahamu ekondwela peciona siku langu, eiona ndipo ekondwa.'' ->>>>>>> 36a080f1bf55b8f5850c311d3048dba161f2ba35 +\v 54 Yesu eyankha, "ngati nuzikweza neka, ulemelelo wangu ni wa tyala; ni Atata oni kweza neo_pali ula mukuti ni Mulungu wanu. \v 55 Muliye muzibe eve,koma numuziba neo. ngati ninga labile, 'kuti numuziba lini; Ningabe kwati nimweo, wa wenye. Koma, numuziba ndipo nu sunga mau yake. \v 56 Awisi banu Abraham bekondwela pakuona siku langu; beyiona ndipo bekhondwela." \ No newline at end of file diff --git a/08/57.txt b/08/57.txt index b5333c5..12f9027 100644 --- a/08/57.txt +++ b/08/57.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 57 Ayuda beciti kwa eve, "Ukaliye kwanisha zaka fifty, ndipo wemu ona Abraham?" \v 58 Yesu eciti kwa beve, "Chendi, chendi, nunena kwa weo,akaliye kukhalapo Abraham,NENZE NEO." \v 59 Mwaichi betola myala kuti bamu teme nazo, koma Yesu ezibisa nofumamo mu kacisi. -======= -\v 57 \v 58 \v 59 Ayuda eciti kuli eve,'' ukaliyokwanisha zaka fifite, Abrahamu uliyomuone?'' Yesu eciti kuli beve Zoona, zoona, nikuti kuli mweo akaliyeleko Abrahamu nenzeko, NENZE NEO.'' Etola myala kuti amteme nao, koma Yesu ezi fisa nakufuma mu calici. ->>>>>>> 36a080f1bf55b8f5850c311d3048dba161f2ba35 +\v 57 Ayuda beciti kwa eve, "Ukaliye kwanisha zaka fifty, ndipo wemu ona Abraham?" \v 58 Yesu eciti kwa beve, "Chendi, chendi, nunena kwa weo,akaliye kukhalapo Abraham,NENZE NEO." \v 59 Mwaichi betola myala kuti bamu teme nazo, koma Yesu ezibisa nofumamo mu kacisi. \ No newline at end of file diff --git a/09/title.txt b/09/title.txt index e4704a2..ffb5634 100644 --- a/09/title.txt +++ b/09/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -MUTU 9 -======= -MUTU ->>>>>>> 36a080f1bf55b8f5850c311d3048dba161f2ba35 +MUTU 9 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 664ff9f..adffed5 100644 --- a/manifest.json +++ b/manifest.json @@ -158,6 +158,12 @@ "08-37", "08-39", "08-45", + "08-48", + "08-50", + "08-52", + "08-54", + "08-57", + "09-title", "09-03", "09-06", "09-08",