From f650a9fe36a85869abbd4a3a95318256232767cb Mon Sep 17 00:00:00 2001 From: amaziba_ministries Date: Wed, 16 Aug 2023 19:57:08 +0900 Subject: [PATCH] Wed Aug 16 2023 19:57:08 GMT+0900 (Yakutsk Standard Time) --- 02/24.txt | 6 +----- 02/27.txt | 6 +----- 03/01.txt | 6 +----- 03/04.txt | 6 +----- 03/title.txt | 6 +----- manifest.json | 7 ++++++- 6 files changed, 11 insertions(+), 26 deletions(-) diff --git a/02/24.txt b/02/24.txt index 41f2e52..52c6cf8 100644 --- a/02/24.txt +++ b/02/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 Imwe kye mwawuliire okuva ku luberyeberye kibbenga mu imwe. Kye mwawulira okuva ku luberyeberye bwekyabbanga mu imwe, mwena mwabbannga mu Mwana ne mu Itawaisu. \v 25 Na kuno niikwo kusuubiza kwe yatusuubizirye, obulamu obutawaawo. \v 26 Ebyo mbawandiikire olw'ebigambo by'abo abakyamya. -======= -\v 24 Muleke ekyo ekyemwawulire okuva kuluberere kibabemu.Singa ekyo ekimwawulire okuva kuluberebere kibasigalamu,mwalyewogara okuba mumwana ne itaye \v 25 .Era kino nikyo ekisubizo ekiyatusubizire ,obulamu obutavawo. \v 26 Mbawaadikira ebitu bino ebikwata kwabo ababakyama. ->>>>>>> f0ad1e9bb7a3f5293bd23d81e99378fd1b1506f3 +\v 24 Imwe kye mwawuliire okuva ku luberyeberye kibbenga mu imwe. Kye mwawulira okuva ku luberyeberye bwekyabbanga mu imwe, mwena mwabbannga mu Mwana ne mu Itawaisu. \v 25 Na kuno niikwo kusuubiza kwe yatusuubizirye, obulamu obutawaawo. \v 26 Ebyo mbawandiikire olw'ebigambo by'abo abakyamya. \ No newline at end of file diff --git a/02/27.txt b/02/27.txt index c2839a9..7757e1f 100644 --- a/02/27.txt +++ b/02/27.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 27 Mwena okufukibwaku amafuta kwe mwaweweibwe iye kubba mu imwe, so temwetaaga muntu yenayena okubayigirizanga; naye ng'okufuka kwe okw'amafuta bwe kubayigiriza mu bigambo byonabyona, era kwa mazima so ti bubbeyi, era nga bwe kwabayigirizirie, mubbenga mu iye. \v 28 Ne atyanu, abaana abatobato, mubbenga mu iye; bw'alibonesebwa kaisi tubbe n'obugumu, era ensoni gireke okutukwatira mu maiso ge mu kwiza kwe. \v 29 Oba nga mumaite nga mutuukirivu, era mutegeera nga buli muntu yenna akola obutuukirivu yazaaliibwe iye. -======= -\v 27 Naye amafuta agamwafunire okuva gyali,gyali mwimwe era temwataga omutu yennayenna okubasomesia.Naye nga okufukiwaku amafuta gyekubasomesia ebintu byonnabyonna era nga kyamazima nga muwula obulimba nga era ekyibasomeserye.Mubenga mwiye. \v 28 Era atiano bannabange abatobato,mubenga mwiye.Awaliboneka kaisi tusobole okuba nobugumu era tuleme okuswala mumaiso ge mwikwira kwe. \v 29 Imuba mumaite nti mutukirivu,mukyimaite nti bulimuntu akola ebyabutukirivu azalibya katonda ->>>>>>> f0ad1e9bb7a3f5293bd23d81e99378fd1b1506f3 +\v 27 Mwena okufukibwaku amafuta kwe mwaweweibwe iye kubba mu imwe, so temwetaaga muntu yenayena okubayigirizanga; naye ng'okufuka kwe okw'amafuta bwe kubayigiriza mu bigambo byonabyona, era kwa mazima so ti bubbeyi, era nga bwe kwabayigirizirie, mubbenga mu iye. \v 28 Ne atyanu, abaana abatobato, mubbenga mu iye; bw'alibonesebwa kaisi tubbe n'obugumu, era ensoni gireke okutukwatira mu maiso ge mu kwiza kwe. \v 29 Oba nga mumaite nga mutuukirivu, era mutegeera nga buli muntu yenna akola obutuukirivu yazaaliibwe iye. \ No newline at end of file diff --git a/03/01.txt b/03/01.txt index 4f6cfdb..3f45f9d 100644 --- a/03/01.txt +++ b/03/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 3 \v 1 Mubone okutaka bwe kuli okunene Itawaisu kwe yatuwaire, ife okwetebwanga abaana ba Katonda; era bwe tuli. Ensi kyeva ereka okututegeera, kubanga teyamutegeire iye. \v 2 Abatakibwa, atyanu tuli baana ba Katonda, so kikaali kubonesebwa kye tulibba. Tumaite nti bw'alibonebonesebwa tulifaanana nga iye; kubanga tulimubona nga bw'ali. \v 3 Era buli muntu yenayena alina eisuubi eryo mu iye yetukuzia ng'oyo bw'ali omutukuvu. -======= -\c 3 \v 1 Mubone kutaka okunene katonda kwatuwaire, okwetewa abana be.nolwekyo ensi tetumaite, olwaba tiyamumanyire. \v 2 Bakwangwa, tulibana ba katonda atenga ekyitwalliba kyikali okumanyika, tumait nti obuyaliboneka tyalifanana nga iye kubanga tulimuwona nga owali. \v 3 Buli muntu yeyena alina esubi muye yetukulya nga iye wali mutukulye. ->>>>>>> f0ad1e9bb7a3f5293bd23d81e99378fd1b1506f3 +\c 3 \v 1 Mubone okutaka bwe kuli okunene Itawaisu kwe yatuwaire, ife okwetebwanga abaana ba Katonda; era bwe tuli. Ensi kyeva ereka okututegeera, kubanga teyamutegeire iye. \v 2 Abatakibwa, atyanu tuli baana ba Katonda, so kikaali kubonesebwa kye tulibba. Tumaite nti bw'alibonebonesebwa tulifaanana nga iye; kubanga tulimubona nga bw'ali. \v 3 Era buli muntu yenayena alina eisuubi eryo mu iye yetukuzia ng'oyo bw'ali omutukuvu. \ No newline at end of file diff --git a/03/04.txt b/03/04.txt index e7d7649..5fd71aa 100644 --- a/03/04.txt +++ b/03/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Buli muntu yenayena akola ekibbiibi, akola n'obujeemu; era ekibbiibi niibwo bujeemu. \v 5 Era mumaite ng'oyo yaboneseibwe era atwoirewo ebibbiibi; ne mu iye mubula kibbiibi. \v 6 Buli muntu yenayena abba mu iye takola kibbiibi: buli muntu yenayena akola ekibbiibi nga tamubonangaku, so tamutegeera. -======= -\v 4 Buli muntu akola ekibbiibbi abba amennyere eiteeka kuba eiteeka limenyeebwa kibbiibbi. \v 5 Atenga mukimaite nti yaizire kutolayo bibbiibbi kuba mwiiye mubula bibbiibbi. \v 6 Buli abba mwiiye takola ebibbiibbbi era akola ebibbiibbi tamuwonanga waire kumumannya. ->>>>>>> f0ad1e9bb7a3f5293bd23d81e99378fd1b1506f3 +\v 4 Buli muntu yenayena akola ekibbiibi, akola n'obujeemu; era ekibbiibi niibwo bujeemu. \v 5 Era mumaite ng'oyo yaboneseibwe era atwoirewo ebibbiibi; ne mu iye mubula kibbiibi. \v 6 Buli muntu yenayena abba mu iye takola kibbiibi: buli muntu yenayena akola ekibbiibi nga tamubonangaku, so tamutegeera. \ No newline at end of file diff --git a/03/title.txt b/03/title.txt index 4e5f5cb..35179f1 100644 --- a/03/title.txt +++ b/03/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Ensuula 3 -======= -Yokana 3 ->>>>>>> f0ad1e9bb7a3f5293bd23d81e99378fd1b1506f3 +Ensuula 3 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 1d82d90..cf90f29 100644 --- a/manifest.json +++ b/manifest.json @@ -51,6 +51,11 @@ "02-12", "02-15", "02-18", - "02-22" + "02-22", + "02-24", + "02-27", + "03-title", + "03-01", + "03-04" ] } \ No newline at end of file