Wed Aug 16 2023 19:16:56 GMT+0900 (Yakutsk Standard Time)

01/01.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 1 \v 1 Nze omukaire mpadiikira Gayo omutakibwa, gwe ntaka mu mazima. \v 2 Omutakibwa, nsaba obbenga kusa mu bigambo byonabyona era obbenga n'obulamu, ng'omwoyo gwo bwe gubba okusa. \v 3 Kubanga nasanyukire inu ab'oluganda bwe baizire ne bategeezia amazima go, nga iwe bw'otambulira mu mazima. \v 4 Mbula isanyu lingi erisinga lino, okuwulira abaana bange nga batambulira mu mazima.
-=======
-\c 1 \v 1 Okuva eri omukaire Gaayo ogwentaka mu mazima. \v 2 Mukwagwa nsaba nti byombyonna bikutambuulire kusa ate obbe mulamu ng'omwoyo gwo bweguli omulamu. \v 3 Kubanga nasanyukire inno aboluganda weebaizire  nebanteegeza amazima gwo nga iwe w'otambuulira mu mazima. \v 4 Mbula isannyu eringi erisinga lino,  okuwuulira abaana banga nga batambuulira mu mazima.
->>>>>>> ef8fca3ee339b9ce81caca3b8f3abd29ad4b2185
+\c 1 \v 1 Okuva eri omukaire Gaayo ogwentaka mu mazima. \v 2 Mukwagwa nsaba nti byombyonna bikutambuulire kusa ate obbe mulamu ng'omwoyo gwo bweguli omulamu. \v 3 Kubanga nasanyukire inno aboluganda weebaizire  nebanteegeza amazima gwo nga iwe w'otambuulira mu mazima. \v 4 Mbula isannyu eringi erisinga lino,  okuwuulira abaana banga nga batambuulira mu mazima.

01/05.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 5 Omutakibwa, gyo bwesigwa emirimu gyo gyonagyona gy'okolera ab'oluganda era abageni; \v 6 abaategeeza okutaka kwo mu maiso g'ekanisa; abo bw'ewabatambulyanga nga Katonda bw'asaanira, wakolanga kusa: \v 7 kubanga baviireyo olw'Eriina nga tebaweweibwe kintu ba mawanga. \v 8 Kale kitugwaniire okusemberyanga abali ng'abo kaisi tukolenga omulimu gumu n'amazima.
-=======
-\v 5 Mukagwa oli mwesigwa mubuli kintu  ky'okolera abaganda bo waire bagwiira. \v 6 Abawaire obujjulizi kukutaka ko mu maiso ge Kanisa. Abo iwabatambuzanga nga Katonda bwataka oiza kola kusa. \v 7 Ku lwekyo ku lwe liina lya Katonda baibire mu maiso, nnibatatwala ekintu kyonnakyonna okuva eri abagwiira. \v 8 Kale kitugwaniire okusembeeza abantu abalinga abo tulyoke tubbe bayambi abainaibwe mu mazima.
->>>>>>> ef8fca3ee339b9ce81caca3b8f3abd29ad4b2185
+\v 5 Mukagwa oli mwesigwa mubuli kintu  ky'okolera abaganda bo waire bagwiira. \v 6 Abawaire obujjulizi kukutaka ko mu maiso ge Kanisa. Abo iwabatambuzanga nga Katonda bwataka oiza kola kusa. \v 7 Ku lwekyo ku lwe liina lya Katonda baibire mu maiso, nnibatatwala ekintu kyonnakyonna okuva eri abagwiira. \v 8 Kale kitugwaniire okusembeeza abantu abalinga abo tulyoke tubbe bayambi abainaibwe mu mazima.

01/09.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 9 Nawandikiire ekanisa ekigambo: naye Diyotuleefe ataka okubba omukulu waabwe tatwikirirya. \v 10 Bwe ndiiza kyendiva  ne njijukirya abantu ebikolwa bye by'akola ng'atumula ku ife ebigambo ebibbiibi ebibulamu: so ebyo tebimumala, naye era iye mwene tasembezia bo luganda, era n'abataka okubasembezia abaziyizia n'ababbinga mu kanisa.
-=======
-\v 9 Nabawandikiire ekanisa: naye Diyotuleefe ataka okubba omukulu waabe tiyatwanniirizire. \v 10 Owendiza njiza kujukirya abantu ebikolwa bye bakola nga atutumulaku ebigambo ebibbiibbi ebubulamu era nga yenna tasembeeza aboluganda era nabataka okubasembeza abagaana nababbinga mu Kanisa.
->>>>>>> ef8fca3ee339b9ce81caca3b8f3abd29ad4b2185
+\v 9 Nabawandikiire ekanisa: naye Diyotuleefe ataka okubba omukulu waabe tiyatwanniirizire. \v 10 Owendiza njiza kujukirya abantu ebikolwa bye bakola nga atutumulaku ebigambo ebibbiibbi ebubulamu era nga yenna tasembeeza aboluganda era nabataka okubasembeza abagaana nababbinga mu Kanisa.

01/11.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 11 Omutakibwa, tosengereryanga kibbiibi, wabula ekisa. Akola obusa iye wa Katonda: akola obubbiibi nga tabonanga Katonda. \v 12 Demeteriyo asiimibwa bonabona, era n'amazima geene: era feena tutegeeza; weena omaite ng'okutegeeza kwaisu kwa mazima.
-=======
-\v 11 Mukagwa tosengereryanga ekibbiibi kubanga abakikola tiba Katonda era akola ekisa aba abba wa Katonda naye akola ekibbiibbi tebabonanga Katonda. \v 12 Demeteriyo alina obujjulizi bwa bantu bomboona ate nga busa ate sweinna tulina obujjulizi ate nga bwa mazima era butuufu.
->>>>>>> ef8fca3ee339b9ce81caca3b8f3abd29ad4b2185
+\v 11 Omutakibwa, tosengereryanga kibbiibi, wabula ekisa. Akola obusa iye wa Katonda: akola obubbiibi nga tabonanga Katonda. \v 12 Demeteriyo asiimibwa bonabona, era n'amazima geene: era feena tutegeeza; weena omaite ng'okutegeeza kwaisu kwa mazima.

front/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-3 Yokaana
-=======
-3 Yokana
->>>>>>> ef8fca3ee339b9ce81caca3b8f3abd29ad4b2185
+3 Yokaana

manifest.json

@@ -35,5 +35,12 @@
 	"translators": [
 		"amaziba_ministries"
 	],
-	"finished_chunks": []
+	"finished_chunks": [
+		"front-title",
+		"01-title",
+		"01-01",
+		"01-05",
+		"01-09",
+		"01-11"
+	]
 }