diff --git a/08/11.txt b/08/11.txt index 225d0a9..c1fc34f 100644 --- a/08/11.txt +++ b/08/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Teto kamba ka kumvishisha kwanu za cilengedwa ca cendi pa mafano, ofoka umozi,mnekwanu wamene Yesu efwila, oonongeka. \v 12 Mwa ici, mukacimwila anekwanu naku ononga cikumbu mtima cao cofoka, mwacimwila Kristu. \v 13 Teto, ngati cakulya cukhumudwisha mnekwasu, nikalyelini soti nyama, kuti nisamponeshe mnekwasu. -======= -\v 11 Cifukwa ca kumvishisha kwanu pa zazoona za mafano, ula ofoka, mnekwanu wamene Kristu wecifwila, oonongeka. \v 12 Teto, pocimwila anekwanu naku ononga cikumbu mtima cao cofoka, mucimwila Kristu. \v 13 Mwa ici, ngati cakulya cukhumudwisha mnekwasu, nikalyelini soti nyama, kuti nisamponeshe mnekwasu. ->>>>>>> fe15f7d9a478372dfeede69d7b6f723898a8b777 +\v 11 Teto kamba ka kumvishisha kwanu za cilengedwa ca cendi pa mafano, ofoka umozi,mnekwanu wamene Yesu efwila, oonongeka. \v 12 Mwa ici, mukacimwila anekwanu naku ononga cikumbu mtima cao cofoka, mwacimwila Kristu. \v 13 Teto, ngati cakulya cukhumudwisha mnekwasu, nikalyelini soti nyama, kuti nisamponeshe mnekwasu. \ No newline at end of file diff --git a/09/01.txt b/09/01.txt index c14984b..48622f1 100644 --- a/09/01.txt +++ b/09/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 9 \v 1 Ko ninelini omasuliwa? Ko ninelini otumiwa? Ko niliyeone Yesu Ambuye wasu? Ko nimwelini anchito bangu mwa Ambuye? \v 2 Ngati ninelini otumiwa kubayakine, nkhasako nineo kwa mweo. Ndaba mweo nimwe cizindikilo ca utumiki wangu mwa Ambuye. -======= -\c 9 \v 1 Ko ninelini omasuliwa? Ko ninelini otumiwa? Niliye muone Yesu Ambuye wasu? Nimwelini anchito bangu mwa Ambuye? \v 2 Ngati ninelini otumiwa ku banthu bayakine, nkhasako nine otumiwa kwa mweo. Ndaba nimwe cizindikilo ca utumiki wangu mwa Ambuye. ->>>>>>> fe15f7d9a478372dfeede69d7b6f723898a8b777 +\c 9 \v 1 Ko ninelini omasuliwa? Ko ninelini otumiwa? Niliye muone Yesu Ambuye wasu? Nimwelini anchito bangu mwa Ambuye? \v 2 Ngati ninelini otumiwa ku banthu bayakine, nkhasako nine otumiwa kwa mweo. Ndaba nimwe cizindikilo ca utumiki wangu mwa Ambuye. \ No newline at end of file diff --git a/09/03.txt b/09/03.txt index a532b77..5de1c1d 100644 --- a/09/03.txt +++ b/09/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Ici niyecuniteteza kwa bala okosha za neo: \v 4 Ko tiliye ulamulilo wakulya na kumwa? \v 5 Ko tiliye ulamulilo oyenda na mnakazi wasu okhulupilila, monga mwakucitila otumiwa bayakine, monga anekwao ba Ambuye, na Kefa? \v 6 Ko ni Banaba na neo tyala tufunika kusebenza? -======= -\v 3 Ici niye cuniteteza kwabala okosha za neo: \v 4 Ko tiliye ulamulilo wa kulya na kumwa? \v 5 Ko tiliye ulamulilo wonyamula mwanakazi wasu wamene ali okhulupilila, mwakucitila otumiwa bayakine, na anekwao ba Ambuye, na Kefa? \v 6 Kapena nineo neka na Banaba tufunika kusebenza? ->>>>>>> fe15f7d9a478372dfeede69d7b6f723898a8b777 +\v 3 Ici niye cuniteteza kwabala okosha za neo: \v 4 Ko tiliye ulamulilo wa kulya na kumwa? \v 5 Ko tiliye ulamulilo wonyamula mwanakazi wasu wamene ali okhulupilila, mwakucitila otumiwa bayakine, na anekwao ba Ambuye, na Kefa? \v 6 Kapena nineo neka na Banaba tufunika kusebenza? \ No newline at end of file diff --git a/09/title.txt b/09/title.txt index 1d1f865..4f59d39 100644 --- a/09/title.txt +++ b/09/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Mutu -======= -Mutu 9 ->>>>>>> fe15f7d9a478372dfeede69d7b6f723898a8b777 +Mutu 9 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 1fa0257..25bba66 100644 --- a/manifest.json +++ b/manifest.json @@ -121,6 +121,7 @@ "08-01", "08-04", "08-07", + "08-08", "09-12", "09-15", "09-17",