From 86b136fd649e8f0af32eb3662d6ece8c163cf5e1 Mon Sep 17 00:00:00 2001 From: siswati2023 Date: Thu, 5 Jan 2023 08:54:48 +0200 Subject: [PATCH] Thu Jan 05 2023 08:54:47 GMT+0200 (South Africa Standard Time) --- 01/19.txt | 6 +----- 01/21.txt | 6 +----- 01/23.txt | 6 +----- manifest.json | 4 ++++ 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/01/19.txt b/01/19.txt index 38a493d..6785a86 100644 --- a/01/19.txt +++ b/01/19.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 19 Ngoba Indvodzana yaNkulunku, Jesu Khristu, leyashunyayelwa ngitsi kini mine nginaSilasi naThimothi, ayisuye ''Yebo'' na ''Cha.'' Esikhundleni, wahlale angu ''Yebo.'' \v 20 Ngoba tonkhe tetsembiso taNkulunkulu tingu ''Yebo'' kuye. Kungako futsi ngaye sitsi ''Amen'' kuleludvumo lwaNkulunkulu. -======= -\v 19 Ngobe iNdvodzana yaNkulunkulu, Jesu Khristu, le Silvanu, Thimothi nami sammemetela kini, akasiye "yebo" na "cha. " Esikhundleni saloko, ungu "yebo " njalo. \v 20 Ngobe tonkhe tetsembiso taNkulunkulu tingu "yebo " kuYe. Ngako ke ngaYe sitsi "Amen" kube ludvumo kuNkulunkulu. ->>>>>>> c8c94afaf2df65a89adaa59e32bd5f633d57d5e9 +\v 19 Ngoba Indvodzana yaNkulunku, Jesu Khristu, leyashunyayelwa ngitsi kini mine nginaSilasi naThimothi, ayisuye ''Yebo'' na ''Cha.'' Esikhundleni, wahlale angu ''Yebo.'' \v 20 Ngoba tonkhe tetsembiso taNkulunkulu tingu ''Yebo'' kuye. Kungako futsi ngaye sitsi ''Amen'' kuleludvumo lwaNkulunkulu. \ No newline at end of file diff --git a/01/21.txt b/01/21.txt index 0ac9dba..6482c35 100644 --- a/01/21.txt +++ b/01/21.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 21 Nyalo nguNkulunkulu losicinisako tsine sinawe kuKristu, futsi lowasigcoba, \v 22 wabeka luphawu lwakhe tikwetfu wasinika Moya wakhe etinhlitiyweni tetfu njenge sibambiso saloku lokutawuta. -======= -\v 21 Nyalo ke nguNkulunkulu losicinisekisa kuKhristu kanye nani, futsi wasigcoba, \v 22 wabeka luphawu lwakhe kitsi wasipha futsi naMoya etinhlitiyweni tetfu njengesibambiso saloko lokuseta. ->>>>>>> c8c94afaf2df65a89adaa59e32bd5f633d57d5e9 +\v 21 Nyalo ke nguNkulunkulu losicinisekisa kuKhristu kanye nani, futsi wasigcoba, \v 22 wabeka luphawu lwakhe kitsi wasipha futsi naMoya etinhlitiyweni tetfu njengesibambiso saloko lokuseta. \ No newline at end of file diff --git a/01/23.txt b/01/23.txt index 47d3def..265979e 100644 --- a/01/23.txt +++ b/01/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 Esikhundleni, ngibita Nkulunkulu atoba ngufakazi wami kutsi lesizatfu ngingetanga eKhorinthe kwakungukutsi nginonge. \v 24 Loku akusiko ngoba sizama kwenta lukholo lwenu lube nguloku lesifuna kutsi lube ngilo. Esikhundleni, sisebenta nani nekujabula kwakho. -======= -\v 23 Kunaloko, Nkulunkulu ungufakazi wami kutsi sizatfu lesenta ngingeti eKhorinte kwakukutsi nginiphephise. \v 24 Akusiko kutsi setama kulawula kukholwa kwenu kutsi kube njani. Kunaloko, sisebentisana nani kute nitfokote, njengobe nimile ekukholweni. ->>>>>>> c8c94afaf2df65a89adaa59e32bd5f633d57d5e9 +\v 23 Esikhundleni, ngibita Nkulunkulu atoba ngufakazi wami kutsi lesizatfu ngingetanga eKhorinthe kwakungukutsi nginonge. \v 24 Loku akusiko ngoba sizama kwenta lukholo lwenu lube nguloku lesifuna kutsi lube ngilo. Esikhundleni, sisebenta nani nekujabula kwakho. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 20f1d5d..9cfff78 100644 --- a/manifest.json +++ b/manifest.json @@ -47,6 +47,10 @@ "01-11", "01-12", "01-15", + "01-17", + "01-19", + "01-21", + "01-23", "02-title", "02-01", "02-03",