From 09872324befbb7e0028e4aa1969d0cf4819ea570 Mon Sep 17 00:00:00 2001 From: Itai_Viegas Date: Mon, 15 Apr 2024 07:27:43 +0200 Subject: [PATCH] Mon Apr 15 2024 07:27:42 GMT+0200 (Central Africa Time) --- 03/01.txt | 6 +----- 03/04.txt | 6 +----- 03/06.txt | 6 +----- manifest.json | 6 +++++- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/03/01.txt b/03/01.txt index 98c5237..aca1913 100644 --- a/03/01.txt +++ b/03/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 3 \v 1 Pakugumisira, hama, tikumbirirei kuti izwi raMambo rihambiskwe nokukudzwa, kudai ngezverinoita pakati penyu, \v 2 zve, kuti tinunurwe kubva kuvanhu vasikazi kunaka nevakashata, ngekuti andivopi veshe vanokugonda. \v 3 Asi Mambo unogondeka nekuti unozomugwinyisa nekumungwarira kune uwo wakashata. -======= -\c 3 \v 1 Kuzvizinji kozviro,vakoma tsumbiranhi kwatiri kuti mazvi aMambo agare kwandiri, kuti Akujue, Kudai pakati penhu; \v 2 Kuti tisungunuke Kuvandhu vakashata,ngokuti gonda ariripi kuvandhu vese. \v 3 Asi wakarurama ndimambo, kvauti vamuonerere nokushengeta kuvakashata ->>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad +\c 3 \v 1 Pakugumisira, hama, tikumbirirei kuti izwi raMambo rihambiskwe nokukudzwa, kudai ngezverinoita pakati penyu, \v 2 zve, kuti tinunurwe kubva kuvanhu vasikazi kunaka nevakashata, ngekuti andivopi veshe vanokugonda. \v 3 Asi Mambo unogondeka nekuti unozomugwinyisa nekumungwarira kune uwo wakashata. \ No newline at end of file diff --git a/03/04.txt b/03/04.txt index eb3f1c1..139ca38 100644 --- a/03/04.txt +++ b/03/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Nesu tine gonda munaMambo ndimwi, kuti munoita munozoitazve zviro zvetinomupanga. \v 5 Mambo ngaatungamirire mwoyo yenyu kurudo rwaMwari nomukusengerera kwaKristu. -======= -\v 4 Tinotendera kuna Mambo kwamuri, kuti zvamukuita munoenderera mberi meshita izvo zvandinomutuma. \v 5 Kuti Mambo amutungamirire Moyo Jenhu Kuti muite Rudo Kuna Mwari no Rusengerero Kuna Kristo. ->>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad +\v 4 Nesu tine gonda munaMambo ndimwi, kuti munoita munozoitazve zviro zvetinomupanga. \v 5 Mambo ngaatungamirire mwoyo yenyu kurudo rwaMwari nomukusengerera kwaKristu. \ No newline at end of file diff --git a/03/06.txt b/03/06.txt index 37abf84..c401c53 100644 --- a/03/06.txt +++ b/03/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Nokuti hama, muzita raMambo wedu Jesu Kristu, kuti mupauke kubva kunehama yeshe inenungo, isikahambi kudai ngemipango yevakaashira kubva kwetiri. \v 7 Ngokuti imwimwi mwemene munozia njira yokutiedzerera ndiyo isusu; ngokuti atizi kuita nungo pakati penyu, \v 8 atizi kurha chingwa chomunhu nokuti ngouri tisikazi kuchitenga, asi takashanda techitambudzika usiku nemasikati kuti tisazoita mutwaro kunoumwe wenyu. \v 9 Haiwa ngokuti tainga tisina simba, asi kuti tidziite chionero kwomuri, kuti imwimwi mutedzerere. -======= -\v 6 Asi itusu tinomutuma, hama, noZina raMambo Jesu Kristo, kuti mugare ndhambo kuno vano famba vashina kurongeka, kushiripi komulairo ya takahashira. \v 7 Ngokuti imwimwi munozviziva kuti tevejera, ngokuti itusu atina kutama kurongueka kwamuri; \v 8 Ngokuti atizivi kuha mahara shingua, Asi ngobasa nokuremba takashanda no usiku no massikati, kuti tishanesua ngaumwe zvondhozvo, \v 9 Ngokuti itusu taifamba pamufananijo venhu, kuti timutevejere. ->>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad +\v 6 Nokuti hama, muzita raMambo wedu Jesu Kristu, kuti mupauke kubva kunehama yeshe inenungo, isikahambi kudai ngemipango yevakaashira kubva kwetiri. \v 7 Ngokuti imwimwi mwemene munozia njira yokutiedzerera ndiyo isusu; ngokuti atizi kuita nungo pakati penyu, \v 8 atizi kurha chingwa chomunhu nokuti ngouri tisikazi kuchitenga, asi takashanda techitambudzika usiku nemasikati kuti tisazoita mutwaro kunoumwe wenyu. \v 9 Haiwa ngokuti tainga tisina simba, asi kuti tidziite chionero kwomuri, kuti imwimwi mutedzerere. \ No newline at end of file diff --git a/manifest.json b/manifest.json index d83e278..5ad5033 100644 --- a/manifest.json +++ b/manifest.json @@ -52,6 +52,10 @@ "02-08", "02-11", "02-13", - "03-title" + "02-16", + "03-title", + "03-01", + "03-04", + "03-06" ] } \ No newline at end of file