From ae52cb4134cb9ed76aa37144542e8edb9057b784 Mon Sep 17 00:00:00 2001 From: Itai_Viegas Date: Mon, 15 Apr 2024 07:14:53 +0200 Subject: [PATCH] Mon Apr 15 2024 07:14:52 GMT+0200 (Central Africa Time) --- 05/15.txt | 6 +----- 05/19.txt | 6 +----- 05/23.txt | 6 +----- 05/25.txt | 8 +------- manifest.json | 6 +++++- 5 files changed, 9 insertions(+), 23 deletions(-) diff --git a/05/15.txt b/05/15.txt index cefd1e9..c88eb98 100644 --- a/05/15.txt +++ b/05/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Ngwarai kuti pasazoapo naumwe unounzidzira zvakashata kumunhu ngendaa yezvakashata, asi ngenguva dzeshe tsvakai kuita zvakanaka, umwe kwoumweni nokwavari veshe. \v 16 Dakarai nguva dzeshe. \v 17 Kumbirai ngokusikareki. \v 18 Bongai pazviro zveshe; ngokuti ichi chiri kuda kwaMwari muna Kristu Jesu ndimwi. -======= -\v 15 Basopa kuti pachatika kushita ngokushaata, ngokuti ndakatevera kunaka, novamweni navese. \v 16 Dakaranhi nguva yese. \v 17 Kumbiranhi mushikarembi. \v 18 Meshibonga ngozvese. Ngokuti kuda kwaMwari kwa Jesu Kristo kwamuri. ->>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a +\v 15 Ngwarai kuti pasazoapo naumwe unounzidzira zvakashata kumunhu ngendaa yezvakashata, asi ngenguva dzeshe tsvakai kuita zvakanaka, umwe kwoumweni nokwavari veshe. \v 16 Dakarai nguva dzeshe. \v 17 Kumbirai ngokusikareki. \v 18 Bongai pazviro zveshe; ngokuti ichi chiri kuda kwaMwari muna Kristu Jesu kwomuri. \ No newline at end of file diff --git a/05/19.txt b/05/19.txt index 90da1d5..ae751c8 100644 --- a/05/19.txt +++ b/05/19.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 19 9 Musadzima Mweya. \v 20 Musashoora mazwi akaprofetwa. \v 21 Asi edzai zviro zveshe; batisisai izvo zvakanaka. \v 22 Swederai miemo yezveshe zvakashata. -======= -\v 19 Musharipa kushata ngomweya. \v 20 mushaherusa shiprofeti. \v 21 Tesitanhi zvese, meshita zvakanaka. \v 22 Zvishaitika kuwamuri zvakashata. ->>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a +\v 19 9 Musadzima Mweya. \v 20 Musashoora mazwi akaprofetwa. \v 21 Asi edzai zviro zveshe; batisisai izvo zvakanaka. \v 22 Swederai miemo yezveshe zvakashata. \ No newline at end of file diff --git a/05/23.txt b/05/23.txt index 1ab4ee3..4f597ea 100644 --- a/05/23.txt +++ b/05/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 Mwari wekunyarara emene ngaamuchenese kakuru; mweya wenyu nemwoyo nemuiri ngazvingwarirwe kukuru, zvisina ndaa pakuuya kwaMambo wedu Jesu Kristu. \v 24 Uwo wakamudaidza unogondeka, naye unozozviita. -======= -\v 23 Mwari endhoo orunhararo ngamushenese kuzvese. Asi mweya wenyu mwese, kutu mweya nomuviri ushengeteke nokutama kukhomju mukuvia kwaJesu Kristo. \v 24 Wakarurama ngawiya wakamudainja, iyenavo anozoitavo. ->>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a +\v 23 Mwari wekunyarara emene ngaamuchenese kakuru; mweya wenyu nemwoyo nemuiri ngazvingwarirwe kukuru, zvisina ndaa pakuuya kwaMambo wedu Jesu Kristu. \v 24 Uwo wakamudaidza unogondeka, naye unozozviita. \ No newline at end of file diff --git a/05/25.txt b/05/25.txt index fb33b89..6ceffeb 100644 --- a/05/25.txt +++ b/05/25.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 25 Hama, tikumbirirei. \v 26 Chingamidzai -veshe vatendi ngemuromo ngokucheneswa. \v 27 Ndinomupanga kukuru ndiMambo kuti iyi -tsamba idzidzwe kuhama dzeshe. \v 28 Nyasha dzaMambo wedu Jesu Kristu ngadzigare nemwi. -======= -\v 25 Hama, namatanhi kwatiri. \v 26 Ctungamijananhi hama jese ngomuromo rakasheneswa. \v 27 ndonomutuma kunaMambo kuti tsamba iyi iverengwe no hama jese. \v 28 Nhasha jaMambo wedu Jesu Kristo ngajigare kwamuri. ->>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a +\v 25 Hama, tikumbirirei. \v 26 Chingamidzai veshe vatendi ngemuromo ngokucheneswa. \v 27 Ndinomupanga kukuru ndiMambo kuti iyi tsamba idzidzwe kuhama dzeshe. \v 28 Nyasha dzaMambo wedu Jesu Kristu ngadzigare nemwi. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 2c6d797..51b2b7f 100644 --- a/manifest.json +++ b/manifest.json @@ -74,6 +74,10 @@ "05-01", "05-04", "05-08", - "05-12" + "05-12", + "05-15", + "05-19", + "05-23", + "05-25" ] } \ No newline at end of file