diff --git a/01/02.txt b/01/02.txt index 6a732c0..be0e0f1 100644 --- a/01/02.txt +++ b/01/02.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 2 Tinobonga Mwari nguva dzeshe ndimwi mweshe, techimukarakadza mumukumbiro yedu. \v 3 Tinogara techimukarakadza pamberi paMwari naBaba edu ngemushando wenyu wokugonda nokushandira kwenyu murudo nokusengerera kwokugonda munaMambo wedu Jesu Kristu. -======= -\v 2 Itusu tinotenda Mwari kuna imwimwi mwese, kumuchowedjera munamato vedu. \v 3 Nokurangarira kwedu, pamberi paMwari Bhaba, noBasa nokugonda kwenyu, no mabasa no kudha kwenyu nochigarano no kushinga kwenyu muna Jesu Kristo. ->>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a +\v 2 Tinobonga Mwari nguva dzeshe ndimwi mweshe, techimukarakadza mumukumbiro yedu. \v 3 Tinogara techimukarakadza pamberi paMwari naBaba edu ngemushando wenyu wokugonda nokushandira kwenyu murudo nokusengerera kwokugonda munaMambo wedu Jesu Kristu. \ No newline at end of file diff --git a/01/04.txt b/01/04.txt index d5eb949..64bf57c 100644 --- a/01/04.txt +++ b/01/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Ngekuti tinozia, hama munodiwa ndiMwari, kuti wakamusarudza, \v 5 ngekuti vhangeri redu arizi kuuya kwomuri ngeizwi rega, asi ngesimbawo nomuMweya Wakachena nokugwinyiswa kukuru. kudai ngezvomunozia kuti tainga tiri vanhu vakadini pakati penyu ngendaa yenyu. -======= -\v 4 Tinoziva, hama djinodika naMwari, itusu tinozwidziva kuti iena vakamusana, \v 5 Ngokuti vangueri redu ariziwi kuguma kuna imwimwi no mazwi, no simba remweia mutwene ngokuti rese rokuti mazwi vaya ngookadi, munodziwa vanarume vanga pakati patiri, vai ita noudakari vedu vakadhakadja. ->>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a +\v 4 Ngekuti tinozia, hama munodiwa ndiMwari, kuti wakamusarudza, \v 5 ngekuti vhangeri redu arizi kuuya kwomuri ngeizwi rega, asi ngesimbawo nomuMweya Wakachena nokugwinyiswa kukuru. kudai ngezvomunozia kuti tainga tiri vanhu vakadini pakati penyu ngendaa yenyu. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 9a63667..be0549c 100644 --- a/manifest.json +++ b/manifest.json @@ -43,6 +43,8 @@ "finished_chunks": [ "front-title", "01-title", + "01-02", + "01-04", "01-06", "01-08", "02-title",