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

01/01.txt

@@ -1 +1,5 @@
-\c 1 \v 1 Nze omukaire mpandiikira omukyala omulonde n'abaana be nze be ntaka mu mazima; so ti nze nzenka, era naye ne bonabona abategeera amazima; \v 2 olw'amazima agabba mu ife, era agabbanga naife emirembe n'emirembe: \v 3 ekisa, okusaasira, emirembe ebiva eri Katonda Itawaisu n'eri Yesu Kristo Omwana wa Itawaisu, byabbanga naife mu mazima n'okutaka.
+<<<<<<< HEAD
+\c 1 \v 1 Nze omukaire mpandiikira omukyala omulonde n'abaana be nze be ntaka mu mazima; so ti nze nzenka, era naye ne bonabona abategeera amazima; \v 2 olw'amazima agabba mu ife, era agabbanga naife emirembe n'emirembe: \v 3 ekisa, okusaasira, emirembe ebiva eri Katonda Itawaisu n'eri Yesu Kristo Omwana wa Itawaisu, byabbanga naife mu mazima n'okutaka.
+=======
+\c 1 \v 1 Nze omukaire mpandikira omukali omulonde nabaana  abentaka amazima, tininze zenka naye nabo abamaite amazima. \v 2 Olwamazima agalimwiswe era agali kwaba okuba mwiswe emirembe ne mirembe. \v 3 Ekisa okusasira n'emirembe egiva  eri katonda itawaiswu ne yesu kristo omwana wa Itawaisu, bibbenga naiswe  mu mazima n'okutaka.
+>>>>>>> e874f0490a5ef2ede335b7fb564d3940610fe391

01/04.txt

@@ -1 +1,5 @@
-\v 4 Nsanyukire inu kubanga nasangire abamu ku baana bo nga batambulira mu mazima, nga bwe twaweweibwe Itawaisu ekiragiro. \v 5 Era atyanu nkwegayirira, omukyala, ti ng'akuwandiikira ekiragiro ekiyaka wabula kye twabbaire nakyo okuva ku luberyeberye, tutakaganenga fenka na fenka. \v 6 Na kuno niikwo kutaka okutambuliranga mu biragiro bye. Ekyo niikyo kiragiro, nga bwe mwawulire okuva ku luberyeberye kaisi mukitambulirengamu.
+<<<<<<< HEAD
+\v 4 Nsanyukire inu kubanga nasangire abamu ku baana bo nga batambulira mu mazima, nga bwe twaweweibwe Itawaisu ekiragiro. \v 5 Era atyanu nkwegayirira, omukyala, ti ng'akuwandiikira ekiragiro ekiyaka wabula kye twabbaire nakyo okuva ku luberyeberye, tutakaganenga fenka na fenka. \v 6 Na kuno niikwo kutaka okutambuliranga mu biragiro bye. Ekyo niikyo kiragiro, nga bwe mwawulire okuva ku luberyeberye kaisi mukitambulirengamu.
+=======
+\v 4 Nsannyukire inno okusanga nga abaana baaimmwe batambuulira mu mazima nga weetwafunire ekiragiro okuva eri Itawaisu. \v 5 Atyano nkwegayirira iwe omukaali tinga akuwandiikira ekiragiro ekiyaaka naye ekyetwabbaire nakyo okuva ku ntandiikwa, tutakaganenga ffenka ffenka. \v 6 Kuno niiko okutaka nti tutambuulire okusinzira ku biragiro bye. Kino niikyo ekiragiro ekemwawuulire okuva ku ntandiikwa kyetulina okutambuulirangamu.
+>>>>>>> e874f0490a5ef2ede335b7fb564d3940610fe391

01/07.txt

@@ -1 +1,5 @@
-\v 7 Kubanga ababbeyabbeya bangi abawuluka (abafuluma) mu nsi, abatayatula Yesu Kristo ng'aiza mu mubiri. Oyo niiye mubbeeyi odi era omulabe odi owa Kristo. \v 8 Mwekuumenga muleke okubulwa emirimu gye twakolere, naye muweebwe empeera enamba.
+<<<<<<< HEAD
+\v 7 Kubanga ababbeyabbeya bangi abawuluka (abafuluma) mu nsi, abatayatula Yesu Kristo ng'aiza mu mubiri. Oyo niiye mubbeeyi odi era omulabe odi owa Kristo. \v 8 Mwekuumenga muleke okubulwa emirimu gye twakolere, naye muweebwe empeera enamba.
+=======
+\v 7 Kubanga ababbeeyi bangi ababire mu nsi ate nga tebayatula nti Yesu Kristo yaizire mu mubiri. Ono niiye omubbeeyi ate omulabe wa Kristo. \v 8 Mwekuumenga muleme okufiirw emirimu gitwakolere, naye muweebwe empeera ezwiire.
+>>>>>>> e874f0490a5ef2ede335b7fb564d3940610fe391

01/09.txt

@@ -1 +1,5 @@
-\v 9 Buli muntu abitirira n'atabba mu kuyigiriza kwa Kristo abula Katonda: abba mu kuyigiriza okwo, oyo alina Itwaisu era n'Omwana. \v 10 Omuntu yenayena bw'aizanga gye muli n'ataleeta kuyigiriza okwo temumusembezianga mu nnyumba, so temumusugiryanga: \v 11 kubanga amusugirya aikirirya kimu naye mu bikolwa bye ebibbiibi.
+<<<<<<< HEAD
+\v 9 Buli muntu abitirira n'atabba mu kuyigiriza kwa Kristo abula Katonda: abba mu kuyigiriza okwo, oyo alina Itwaisu era n'Omwana. \v 10 Omuntu yenayena bw'aizanga gye muli n'ataleeta kuyigiriza okwo temumusembezianga mu nnyumba, so temumusugiryanga: \v 11 kubanga amusugirya aikirirya kimu naye mu bikolwa bye ebibbiibi.
+=======
+\v 9 Buli muntu abitirira natabba mu kusomesa kwa Yesu abba abula Katonda naye asigala mukusomesa kwe, abba alina itawaisu n'omwana. \v 10 Omuntu yennayenna ewaiza gyemuli nataleeta okusomesa kuno tumumusugiryanga kubanga \v 11 oyo amusugirya abba yenyigira mu bibbiibbi bye.
+>>>>>>> e874f0490a5ef2ede335b7fb564d3940610fe391

01/12.txt

@@ -1 +1,5 @@
-\v 12 waire nga nina ebigambo bingi okubawandiikira, tintaka kubiwandiika ku lupapula ne bwino: naye nsuubira okwiza gye muli, n'okutumula munwa ku munwa, eisanyu lyayu kaisi lituukirire. \v 13 Abaana ba mugande wo omulonde bakusugiirye.
+<<<<<<< HEAD
+\v 12 waire nga nina ebigambo bingi okubawandiikira, tintaka kubiwandiika ku lupapula ne bwino: naye nsuubira okwiza gye muli, n'okutumula munwa ku munwa, eisanyu lyayu kaisi lituukirire. \v 13 Abaana ba mugande wo omulonde bakusugiirye.
+=======
+\v 12 Ndina ebintu bingi ebyokubawandiikira naye tinatakire kubiwandiika ku lupapula ne bwino: naye nsuubira okwiiza gyemuli okwogera maiso ku maiso, essanyu lyaisu lituukirire. \v 13 Abaana b'omugandawo omulonde bakulamusirye.
+>>>>>>> e874f0490a5ef2ede335b7fb564d3940610fe391

01/title.txt

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

LICENSE.md

@@ -1,4 +1,5 @@
 
+<<<<<<< HEAD
 ## Creative Commons Attribution-ShareAlike 4.0 International
 
 ### Human-Readable Summary 
@@ -36,4 +37,34 @@ http://creativecommons.org/licenses/by-sa/4.0/.
 
   
 
-This PDF was generated using Prince (https://www.princexml.com/).
+This PDF was generated using Prince (https://www.princexml.com/).
+=======
+# License
+## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
+
+This is a human-readable summary of (and not a substitute for) the full license found at http://creativecommons.org/licenses/by-sa/4.0/.
+
+### You are free to:
+
+  * **Share** — copy and redistribute the material in any medium or format
+  * **Adapt** — remix, transform, and build upon the material 
+
+for any purpose, even commercially.
+
+The licensor cannot revoke these freedoms as long as you follow the license terms.
+
+### Under the following conditions:
+
+  * **Attribution** — You must attribute the work as follows: "Original work available at https://door43.org/." Attribution statements in derivative works should not in any way suggest that we endorse you or your use of this work.
+  * **ShareAlike** — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
+
+**No additional restrictions** — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.
+
+### Notices:
+
+You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
+
+No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
+
+This PDF was generated using Prince (https://www.princexml.com/).
+>>>>>>> e874f0490a5ef2ede335b7fb564d3940610fe391

front/title.txt

@@ -1 +1,5 @@
-2 Yokaana
+<<<<<<< HEAD
+2 Yokaana
+=======
+2 Yokana
+>>>>>>> e874f0490a5ef2ede335b7fb564d3940610fe391

manifest.json

@@ -35,13 +35,5 @@
 	"translators": [
 		"amaziba_ministries"
 	],
-	"finished_chunks": [
-		"front-title",
-		"01-title",
-		"01-01",
-		"01-04",
-		"01-07",
-		"01-09",
-		"01-12"
-	]
+	"finished_chunks": []
 }