diff --git a/01/11.txt b/01/11.txt index d65c84a..49e6cfd 100644 --- a/01/11.txt +++ b/01/11.txt @@ -1,3 +1 @@ -\v 11 Ngeiyi ndaa isusu tinomukumbirira nguva dzeshe, techikumbira kuti Mwari wedu amuite -vanofanira mukudaidza kwake nokuzadza ngesimba rake rokudisisa kweshe kuita zvakanaka nemushando wekugonda, \v 12 kuti zita raMambo wedu Jesu riirikidzwe mwomuri, nemwi -muirikidzwe mwaari, dai ngezvakaita nyasha dzaMwari wedu naMambo Jesu Kristu. \ No newline at end of file +\v 11 Ngeiyi ndaa isusu tinomukumbirira nguva dzeshe, techikumbira kuti Mwari wedu amuite vanofanira mukudaidza kwake nokuzadza ngesimba rake rokudisisa kweshe kuita zvakanaka nemushando wekugonda, \v 12 kuti zita raMambo wedu Jesu riirikidzwe mwomuri, nemwi muirikidzwe mwaari, dai ngezvakaita nyasha dzaMwari wedu naMambo Jesu Kristu. \ No newline at end of file diff --git a/02/01.txt b/02/01.txt index 2eac3f2..ad2a43e 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 2 \v 1 Hama, ngendaa yekuuya kwaMambo wedu Jesu Kristu nokuunganidzwa kwedu kwaari, \v 2 tinokumbira kuti musazokasira kuzunguniswa mumipinimidzo nokuti kushamiswa, kunyazwi ngomweya nokuti ngeizwi nokuti ngetsamba, yakadai ngeinobva kwetiri, yechiti zuva raMambo raguma. -======= -\c 2 \v 1 Vakoma tinomungaja ngondava yo kuviya kwamabo Jesu Kristo pakubatana kwedu nayena. \v 2 Ngokuti amuzvizivi ngokukasika kuzua kwenhu mushaneseka mweya, wenhu ngondava yommazui akatawha kwatiri ngokuti mazuva aKristo aphedo. ->>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad +\c 2 \v 1 Hama, ngendaa yekuuya kwaMambo wedu Jesu Kristu nokuunganidzwa kwedu kwaari, \v 2 tinokumbira kuti musazokasira kuzunguniswa mumipinimidzo nokuti kushamiswa, kunyazwi ngomweya nokuti ngeizwi nokuti ngetsamba, yakadai ngeinobva kwetiri, yechiti zuva raMambo raguma. \ No newline at end of file diff --git a/02/03.txt b/02/03.txt index 46da013..54fc468 100644 --- a/02/03.txt +++ b/02/03.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 3 Musazochengedzerwa ngemunhu kunyazwi ngeiri njira; ngekuti zuva iro arizogumi kusati -kwaapo kupauka kutanga, nemunhu wokushaisha asati aoniswa, Mwanakomana wekurashwa. \v 4 uwo unorwisa nokudzitunhumadza padera pazvo zveshe zvinozwi zvimwari nepadera -pezvinodirwa, ndizvo unogara pachigaro chake mutemperi raMwari, echidziita Mwari. -======= -\v 3 Apana anomujengeja ngokuti azovi zuva kuti zvikuvandhu nokururama kuvakarasika. \v 4 Vanomuka vedhanja Mwari ngokudaro vanozonamatwa vanozoga pateperi raMwari, vofanana naye. ->>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad +\v 3 Musazochengedzerwa ngemunhu kunyazwi ngeiri njira; ngekuti zuva iro arizogumi kusati kwaapo kupauka kutanga, nemunhu wokushaisha asati aoniswa, Mwanakomana wekurashwa. \v 4 uwo unorwisa nokudzitunhumadza padera pazvo zveshe zvinozwi zvimwari nepadera pezvinodirwa, ndizvo unogara pachigaro chake mutemperi raMwari, echidziita Mwari. \ No newline at end of file diff --git a/manifest.json b/manifest.json index bc89b96..c13ba93 100644 --- a/manifest.json +++ b/manifest.json @@ -44,7 +44,10 @@ "01-03", "01-06", "01-09", + "01-11", "02-title", + "02-01", + "02-03", "03-title" ] } \ No newline at end of file