From 8d2a61a6392401c3b7a28d11b58ef78d69badc8c Mon Sep 17 00:00:00 2001 From: Itai_Viegas Date: Mon, 15 Apr 2024 07:25:43 +0200 Subject: [PATCH] Mon Apr 15 2024 07:25:42 GMT+0200 (Central Africa Time) --- 02/05.txt | 6 +----- 02/08.txt | 6 +----- 02/11.txt | 7 +------ 02/13.txt | 9 ++------- 02/16.txt | 6 +----- manifest.json | 4 ++++ 6 files changed, 10 insertions(+), 28 deletions(-) diff --git a/02/05.txt b/02/05.txt index 0d2d25a..69c6442 100644 --- a/02/05.txt +++ b/02/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Amuchakarakadzi here kuti apo ndichiriipo nemwi ndakamureketera izvi zviro? \v 6 Nazvino munozia icho chinomurambidza, kuti uwo aoniswe ngenguva yake yaguma. \v 7 Ngokuti chakafishika chisikazi kunaka choshanda; asi zvichaitika metsa uwo unorambidza zvino abviswa. -======= -\v 5 Amucherechezi kuti mainga nainini ndeimvhunja zvonazvo? \v 6 Wari mazviziva zvaitika kuti zviteketesue. \v 7 Ngokuti rutongo roda kuitika, uya oda kuvhisua pakati. ->>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad +\v 5 Amuchakarakadzi here kuti apo ndichiriipo nemwi ndakamureketera izvi zviro? \v 6 Nazvino munozia icho chinomurambidza, kuti uwo aoniswe ngenguva yake yaguma. \v 7 Ngokuti chakafishika chisikazi kunaka choshanda; asi zvichaitika metsa uwo unorambidza zvino abviswa. \ No newline at end of file diff --git a/02/08.txt b/02/08.txt index 1727018..99c1021 100644 --- a/02/08.txt +++ b/02/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Apo wakashata unozooneswa, uwo unozoparadzwa ndiMambo Jesu ngemweya womuromo wake, nekumuparadza ngokuoneka kwokuuya kwake. \v 9 Kuuya kwouwo usikazi kunaka kwakadai ngekushanda kwaSathani, unoshandisa simba reshe, zvioniso, mishamiso yemanyepo, \v 10 ngembeu yeshe yokuchengedzera kweshe kwokusikanaka kwavari vanorashika, ngokuti vanoramba kuda gwinyiso kuti vaponeswe. -======= -\v 8 Ngokuti anozoshandisua uya anozoparajua ndmwari, \v 9 Ngophepo yomukanua make muviya kwake Satani anova nozvishamiso zvokunhepa, \v 10 Nokujengejab kwese ngokuti avana rudo rokadi kuti vaponese. ->>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad +\v 8 Apo wakashata unozooneswa, uwo unozoparadzwa ndiMambo Jesu ngemweya womuromo wake, nekumuparadza ngokuoneka kwokuuya kwake. \v 9 Kuuya kwouwo usikazi kunaka kwakadai ngekushanda kwaSathani, unoshandisa simba reshe, zvioniso, mishamiso yemanyepo, \v 10 ngembeu yeshe yokuchengedzera kweshe kwokusikanaka kwavari vanorashika, ngokuti vanoramba kuda gwinyiso kuti vaponeswe. \ No newline at end of file diff --git a/02/11.txt b/02/11.txt index ced5ead..d574296 100644 --- a/02/11.txt +++ b/02/11.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 11 Ngeiyi ndaa Mwari unovatumira simba guru rekuvapausa, kuti vatende manyepo, \v 12 kuti -veshe vasikatendi gwinyiso, asi vechidakadzwa ngekusakatendeka vatongwe. -======= -\v 11 Ngokudaro Mwari anozotuma bhasa rakashata kuvaia vanoda zvokunhepa. \v 12 Kuti vaende kugehena vashina zvokadi, asi vakazuwa tshumairo. ->>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad +\v 11 Ngeiyi ndaa Mwari unovatumira simba guru rekuvapausa, kuti vatende manyepo, \v 12 kuti veshe vasikatendi gwinyiso, asi vechidakadzwa ngekusakatendeka vatongwe. \ No newline at end of file diff --git a/02/13.txt b/02/13.txt index 2a46bc4..7ab3be9 100644 --- a/02/13.txt +++ b/02/13.txt @@ -1,7 +1,2 @@ -<<<<<<< HEAD -\v 13 Asi kunodikanwa kuti tibonge Mwari nguva dzeshe ngendaa yenyu, hama dzinodikanwa -munaMambo, ngekuti Mwari wakaketera kuita muchero yekutanga yeruponeso kubudikidza -ngokucheneswa kwoMweya nokubudikidza ngekutenda gwinyiso. \v 14 Ngekuti izvi ndizvo zvaakamudaidzira kubudikidza ngevhangeri redu, kuti muashire uthende waMambo wedu Jesu Kristu. \v 15 Ndizvo, hama, emai mwakagwinya, mubate mupango yemwakadzidziswa tisu, kunyazwi ngeizwi nokuti ngetsamba yedu. -======= -\v 13 Asi nguva ese ngatipe nhasha jaMwari tivadikani vaVambo, Ngokuti Mwari wakasana kare pakuponesuwa pamwea; \v 14 Okadi nogonda, pamakadainjua pakati povhangeri redu, Mambo Jesu Kristo. \v 15 Ngokudaro, hama, ngarai, makaperera kuzvia zvamakajijisua kumazvi osamba yedu. ->>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad +\v 13 Asi kunodikanwa kuti tibonge Mwari nguva dzeshe ngendaa yenyu, hama dzinodikanwa munaMambo, ngekuti Mwari wakaketera kuita muchero yekutanga yeruponeso kubudikidza +ngokucheneswa kwoMweya nokubudikidza ngekutenda gwinyiso. \v 14 Ngekuti izvi ndizvo zvaakamudaidzira kubudikidza ngevhangeri redu, kuti muashire uthende waMambo wedu Jesu Kristu. \v 15 Ndizvo, hama, emai mwakagwinya, mubate mupango yemwakadzidziswa tisu, kunyazwi ngeizwi nokuti ngetsamba yedu. \ No newline at end of file diff --git a/02/16.txt b/02/16.txt index 2dd2b91..127422a 100644 --- a/02/16.txt +++ b/02/16.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 16 Zvino, ndizvo, Mambo wedu Jesu Kristu emene naMwari Baba edu, uwo wakatida nokubudikidza ngenyasha wakatipa kuembedzerwa kusikaperi negonda rakanaka, \v 17 ngaaembedzere mwoyo yenyu nekuigwinyisa kumushando yeshe nekumazwi eshe akanaka. -======= -\v 16 Ivona, Mambo wedu Jesu Kristo, Wedu Mwari naBaba, wedu wakatinda panhasha otipa ruvetero rorunhararo; \v 17 Iyena ngaembesere moyo, jenhu nobasa . ->>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad +\v 16 Zvino, ndizvo, Mambo wedu Jesu Kristu emene naMwari Baba edu, uwo wakatida nokubudikidza ngenyasha wakatipa kuembedzerwa kusikaperi negonda rakanaka, \v 17 ngaaembedzere mwoyo yenyu nekuigwinyisa kumushando yeshe nekumazwi eshe akanaka. \ No newline at end of file diff --git a/manifest.json b/manifest.json index c13ba93..d83e278 100644 --- a/manifest.json +++ b/manifest.json @@ -48,6 +48,10 @@ "02-title", "02-01", "02-03", + "02-05", + "02-08", + "02-11", + "02-13", "03-title" ] } \ No newline at end of file