Wed Aug 16 2023 20:05:08 GMT+0900 (Yakutsk Standard Time)

04/11.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 11 Abatakibwa, nga Katonda bwe yatutakire atyo, feena kitugwanira okutakagananga. \v 12 Wabula eyabbaire aboine ku Katonda wonawona: bwe tutakagana, Katonda abba mu ife, n'okutaka kwe nga kutuukiriire mu ife: \v 13 ku kino kwe tutegeerera nga tubba mu iye, yeena mu ife, kubanga yatuwaire ku Mwoyo gwe. \v 14 feena twaboine era tutegeeza nga Itawaisu yatumire Omwana we okubba Omulokozi w'ensi.
-=======
-\v 11 Abeemikwano owabba Katonda yatutakire, ffenna tutakaganenga. \v 12 Ebula eyabweineku Katonda awantu wonnawonna, eweetutakagana Katonda abba mwiife n'omukwano ggwe gutuukirira mwiife. \v 13 Kuno niiko kwetumanyira nga tuli mwiiye era yenna nga ali mwiiffe kubanga yatuwaire omwoyo we. \v 14 Twamuweine era tujjulira nti Itawaisu yasindikire omununuzi w'ensi eno.
->>>>>>> f0ad1e9bb7a3f5293bd23d81e99378fd1b1506f3
+\v 11 Abatakibwa, nga Katonda bwe yatutakire atyo, feena kitugwanira okutakagananga. \v 12 Wabula eyabbaire aboine ku Katonda wonawona: bwe tutakagana, Katonda abba mu ife, n'okutaka kwe nga kutuukiriire mu ife: \v 13 ku kino kwe tutegeerera nga tubba mu iye, yeena mu ife, kubanga yatuwaire ku Mwoyo gwe. \v 14 feena twaboine era tutegeeza nga Itawaisu yatumire Omwana we okubba Omulokozi w'ensi.

04/15.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 15 Buli ayatula nga Yesu niiye Mwana wa Katonda, Katonda abba mu iye, yeena mu Katonda. \v 16 Ate twategeire era twaikirirye okutaka Katonda kw'alina gye tuli. Katonda kutaka; n'oyo abba mu kutaka abba mu Katonda, ne Katonda abba mu iye.
-=======
-\v 15 Buli atumula nti Yesu mwana wa Katonda, Katonda abba mwiiye era yenna abba mu Katatonda. \v 16 Naye twategeire era netwikiriza okwagala Katonda kwali gyetuli, Katonda kwagala nooyo asigala mu kwagala kuno asigala mu Katonda ne Katonda asigala mwiiye.
->>>>>>> f0ad1e9bb7a3f5293bd23d81e99378fd1b1506f3
+\v 15 Buli ayatula nga Yesu niiye Mwana wa Katonda, Katonda abba mu iye, yeena mu Katonda. \v 16 Ate twategeire era twaikirirye okutaka Katonda kw'alina gye tuli. Katonda kutaka; n'oyo abba mu kutaka abba mu Katonda, ne Katonda abba mu iye.

04/17.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 17 Mu ekyo okutaka mwe kutuukirizibwa gye tuli, tubbe n'obugumu ku lunaku olw'omusango; kuba iye nga bw'ali, feena bwe tuli mu nsi muno. \v 18 Mubula kutya mu kutaka, naye okutaka okutuukirivu kusengererya ewanza okutya, kubanga okutya kulimu okubonerezebwa; n'oyo atya akaali kutuukirizibwa mu kutaka.
-=======
-\v 17 Mwekyo mwekutuukirizibwa gyetuli tubbe n'obuvumu ku lunaku lw'omusango nga ye bwaali, ffenna bwetuli munsi muno. \v 18 Mubula kutya mu kwagala naye okwagala okutuukirivu ogobeera wanza okutya kubanga okutya kulimu okubonerezebwa, n'oyo atya akaali okutuukirizibwa mu kwagala.
->>>>>>> f0ad1e9bb7a3f5293bd23d81e99378fd1b1506f3
+\v 17 Mu ekyo okutaka mwe kutuukirizibwa gye tuli, tubbe n'obugumu ku lunaku olw'omusango; kuba iye nga bw'ali, feena bwe tuli mu nsi muno. \v 18 Mubula kutya mu kutaka, naye okutaka okutuukirivu kusengererya ewanza okutya, kubanga okutya kulimu okubonerezebwa; n'oyo atya akaali kutuukirizibwa mu kutaka.

04/19.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 19 Ife tutaka, kubanga iye yasookere okututaka ife. \v 20 Omuntu bw'atumula nti Ntaka Katonda, n'akyawa mugande, mubbeeyi; kubanga atataka mugande gwe yabbaire aboineku, Katonda gw'atabonangaku tasobola kumutaka. \v 21 Era tulina ekiragiro kino ekyaviire gy'ali, ataka Katonda atakenga ne mugande.
-=======
-\v 19 Tutaka kubanga Katonda yatusookere okututaka. \v 20 Omuntu waakoba nti ataka Katonda nakyawa mwiinaye abba mulimba, Owatasobolera okutaka omwiinaye gwabonaku, yataka atya Katonda gwatabonangaku. \v 21 Era kino niikyo ekiragiro kyetulina okuva ewuuwe nti buli ataka Katonda alina n'okutaka mugandawe.
->>>>>>> f0ad1e9bb7a3f5293bd23d81e99378fd1b1506f3
+\v 19 Ife tutaka, kubanga iye yasookere okututaka ife. \v 20 Omuntu bw'atumula nti Ntaka Katonda, n'akyawa mugande, mubbeeyi; kubanga atataka mugande gwe yabbaire aboineku, Katonda gw'atabonangaku tasobola kumutaka. \v 21 Era tulina ekiragiro kino ekyaviire gy'ali, ataka Katonda atakenga ne mugande.

05/01.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 5 \v 1 Buli muntu yenayena aikirirya nga Yesu niiye Kristo, ng'azaalibwe Katonda: na buli ataka eyazaire ataka n'oyo gwe yazaire. \v 2 Ku ekyo kwe tutegeerera nga tutaka abaana ba Katonda, bwe tutaka Katonda ne tukola ebiragiro bye. \v 3 Kubanga kuno niikwo kutaka kwa Katonda ife okukwatanga ebiragiro bye: era ebiragiro bye tebizitowa.
-=======
-\c 5 \v 1 Oyo yennayenna aikirirya nti Kristo yazaalibwire Katonda era nabuli ataka Katanda, ataka negweyazire. \v 2 Kino niikyo kyetutegerera nti tutaka abaana ba Katonda bwetutaka Katonda netukuuma amateeka ge. \v 3 Kuno niiko okutaka kwa Katonda nti tukuume ebiragiro bye era nebiragiro bye timugugu.
->>>>>>> f0ad1e9bb7a3f5293bd23d81e99378fd1b1506f3
+\c 5 \v 1 Buli muntu yenayena aikirirya nga Yesu niiye Kristo, ng'azaalibwe Katonda: na buli ataka eyazaire ataka n'oyo gwe yazaire. \v 2 Ku ekyo kwe tutegeerera nga tutaka abaana ba Katonda, bwe tutaka Katonda ne tukola ebiragiro bye. \v 3 Kubanga kuno niikwo kutaka kwa Katonda ife okukwatanga ebiragiro bye: era ebiragiro bye tebizitowa.

05/04.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 4 Kubanga buli ekyazaaliibwe Katonda kiwangula ensi; era kuno niikwo kuwangula okwawangwire ensi, okwikirirya Itawaisu. \v 5 Era awangula ensi niiye ani, wabula aikirirya nga Yesu niiye Mwana wa Katonda?
-=======
-\v 4 Buli ekizaalibwa Katonda kiwangula ensi. Buno niibwo obuwanguzi obuwangula ensi era niiko okwikkirirya kwaiffe. \v 5 Yani oyo awangula ensi okutolaku oyo akirirya nti Yesu mwana wa Katonda? Oyo aikkirirya nti Yesu mwana wa Katonda.
->>>>>>> f0ad1e9bb7a3f5293bd23d81e99378fd1b1506f3
+\v 4 Kubanga buli ekyazaaliibwe Katonda kiwangula ensi; era kuno niikwo kuwangula okwawangwire ensi, okwikirirya Itawaisu. \v 5 Era awangula ensi niiye ani, wabula aikirirya nga Yesu niiye Mwana wa Katonda?

05/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-Ensuula 5
-=======
-Ensula 5
->>>>>>> f0ad1e9bb7a3f5293bd23d81e99378fd1b1506f3
+Ensuula 5

manifest.json

@@ -68,6 +68,13 @@
 		"04-01",
 		"04-04",
 		"04-07",
-		"04-09"
+		"04-09",
+		"04-11",
+		"04-15",
+		"04-17",
+		"04-19",
+		"05-title",
+		"05-01",
+		"05-04"
 	]
 }