Thu Apr 25 2024 07:23:31 GMT-0700 (Pacific Daylight Time)

01/01.txt

@@ -1 +1,5 @@
-\v 1 Paulu, Silive na Timotei ya vear evuru e Nzeam e Tesalonika eli ya Tea Nzeam ti ya Nkum Yezu Kristu. Ngrasia ti ngemba eyi ya gnu.
+<<<<<<< HEAD
+\v 1 Paulu, Silive na Timotei ya vear evuru e Nzeam e Tesalonika eli ya Tea Nzeam ti ya Nkum Yezu Kristu. Ngrasia ti ngemba eyi ya gnu.
+=======
+\v 1 Polo, Silive na Timotei, ya vear evuru e Nzeam e Tesalonika eli ya Tea Nzeam ti ya Nkum Yezu Kristu. Ngrasia ti ngemba eyi ya gnu.
+>>>>>>> 256891b00dacf5dc9961466fde4b614a4269f4b2

01/02.txt

@@ -1 +1,5 @@
-\v 2 Atsasunkeara ntangu enkum nsag na viye na Nzeam djwi na gnu gnankum, mpe atsasu onkanagni gnu ne bisamu isu.  \v 3  Atsasunkana ntangu enkum ne nteang e Teasu Nzeam otshia o lukwikilu egnu, otshia o lutondo egnu mpe ekaagn egnu e biuu ya Nkum esu Yezu Kristu.
+<<<<<<< HEAD
+\v 2 Atsasunkeara ntangu enkum nsag na viye na Nzeam djwi na gnu gnankum, mpe atsasu onkanagni gnu ne bisamu isu.  \v 3  Atsasunkana ntangu enkum ne nteang e Teasu Nzeam otshia o lukwikilu egnu, otshia o lutondo egnu mpe ekaagn egnu e biuu ya Nkum esu Yezu Kristu.
+=======
+\v 2 Atsasunkeara ntangu enkum nsag-na-viye ya Nzeam djwi na gnu gnankum, mpi atsasu onkanagni gnu ne bisamu isu.  \v 3  Atsasunkana ntangu enkum ne nteang e Teasu Nzeam otshia o lukwikilu egnu, otshia o lutondo egnu mpi ekaagn egnu e biu ya Nkum esu Yezu Kristu.
+>>>>>>> 256891b00dacf5dc9961466fde4b614a4269f4b2

01/04.txt

@@ -1 +1,5 @@
-\v 4 Atwung, gnu aman amileang Nzeam, sijia susun amosonagni, \v 5  djwi along  ayilongsu ekayia ko n'odzum o mpama ve, kansi ayiwo mpi na biuu, na Mpeve Santu ti na kikesa e mveara vear ne lukwikilu. Ohin omog ko, opikug ndjingagni ve oshin nge oyipiersu ne kati egnu djwi na litomba egnu.
+<<<<<<< HEAD
+\v 4 Atwung, gnu aman amileang Nzeam, sijia susun amosonagni, \v 5  djwi along  ayilongsu ekayia ko n'odzum o mpama ve, kansi ayiwo mpi na biuu, na Mpeve Santu ti na kikesa e mveara vear ne lukwikilu. Ohin omog ko, opikug ndjingagni ve oshin nge oyipiersu ne kati egnu djwi na litomba egnu.
+=======
+\v 4 Atwung, gnu aman ali Nzeam amoleangagni, sijia susun amosonagni,  \v 5  djwi along  ayilong su ekayia ko n'odzum o mpama ve, kansi ayiwo mpi na biu, na Mpeve Santu ti na kikesa e mveara vear ne lukwikilu. Oshin omog ko, opikug njingagni ve oshin nge eyipiersu ne kati egnu djwi na mfunu eli ya gnu.
+>>>>>>> 256891b00dacf5dc9961466fde4b614a4269f4b2

01/06.txt

@@ -1 +1,5 @@
-\v 6 Gnu gnemie akum gnu ndjie mbanu esu mpe mbanu e Nkum Yezu n'oshin oyiyamignu otuba o Nzeam ne kati i mpay eshin n'eshin kumosi na kiese eyum na Mpeve Santu.\v 7    Yo yina s'emikum gnu mbanu ne nteang e wandimi inkum i Masedonia ti Akai.
+<<<<<<< HEAD
+\v 6 Gnu gnemie akum gnu ndjie mbanu esu mpe mbanu e Nkum Yezu n'oshin oyiyamignu otuba o Nzeam ne kati i mpay eshin n'eshin kumosi na kiese eyum na Mpeve Santu.\v 7    Yo yina s'emikum gnu mbanu ne nteang e wandimi inkum i Masedonia ti Akai.
+=======
+\v 6 Gnu gnemie akum gnu ndjie mbanu esu mpi mbanu e Nkum Yezu n'oshin oyiyamignu otuba o Nzeam ne kati i mpay eshin n'eshin ti osiang eyum ya Mpeve Santu.  \v 7 Wog enagn, s'emikum gnu mbanu ne nteang e vear ankum amidjir ne Masedonia ti Akai.
+>>>>>>> 256891b00dacf5dc9961466fde4b614a4269f4b2

01/08.txt

@@ -1 +1,5 @@
-\v 8 Djwi na gnu otuba o Nzeam otizabana epa ku ne Masedonia ti n'Akai ve, kansi mpi n'endii enkum eyizabani lukwikilu egnu ya Nzeam, ne mpila nde kakusu diaka na mfunu e ntuba djwi ne tii ve. \v 9  Djwi, wog wemie wekab djwi na su oshin nge oyishwisu etay egnu. Walekab oshin nge emitshimagnu itura etay e Nzeam, oshin omisasiangagnu nzeam ignu i biteke djwi na nsadila Nzeam eli na luzingu mpe eli viavi. \v 10  Waletubi wuwun okwungagni Mon nde eyayum dzug olung mpe eyibiyinde n'ewa. Eli Yezu Kristu, eleselimi ne nkier ileseye ine.
+<<<<<<< HEAD
+\v 8 Djwi na gnu otuba o Nzeam otizabana epa ku ne Masedonia ti n'Akai ve, kansi mpi n'endii enkum eyizabani lukwikilu egnu ya Nzeam, ne mpila nde kakusu diaka na mfunu e ntuba djwi ne tii ve. \v 9  Djwi, wog wemie wekab djwi na su oshin nge oyishwisu etay egnu. Walekab oshin nge emitshimagnu itura etay e Nzeam, oshin omisasiangagnu nzeam ignu i biteke djwi na nsadila Nzeam eli na luzingu mpe eli viavi. \v 10  Waletubi wuwun okwungagni Mon nde eyayum dzug olung mpe eyibiyinde n'ewa. Eli Yezu Kristu, eleselimi ne nkier ileseye ine.
+=======
+\v 8 Djwi na gnu, vear watijia otuba o Nkum,  epa ko ne Masedonia ti n'Akai ve, kansi mpi n'endii enkum emijiawo lukwikilu egnu ya Nzeam, djwi kakusu diaka na mfunu e ntuba ata djwi neti ve.  \v 9 Djwi, wog wemie walekab djwi na su oshin nge oyishwisu etay egnu. Walekab oshin nge emitshimagnu itura etay e Nzeam, oshin omisasiangagnu nzeam ignu i biteke djwi na nsama Nzeam eli na luzingu mpi e masonga.  \v 10 Waletubi wuwun okwungagni Mon nde eyayum dzug olung mpi eyibiyinde n'ewa. Eli Yezu Kristu, eletelimi ne nkier ileseye ine.
+>>>>>>> 256891b00dacf5dc9961466fde4b614a4269f4b2

02/01.txt

@@ -0,0 +1 @@
+\v 1 Gnu gnemie, atwung, ojiagni gnugnun oshin oyikumsu etay egnu ayiwo na mfunu entsign.  \v 2 Ojiagni gnugnun ayen su mpay entsign mpi atetwiwo ne Filipia. Atsug su ekaagn esu etay e Nzeam esu djwi n'ondongagni otuba o Nzeam ne kati e mbaagn to mbangika eshin n'eshin.

02/title.txt

@@ -0,0 +1 @@
+Ikab 2

LICENSE.md

@@ -1,5 +1,35 @@
+<<<<<<< HEAD
 # License
 
 This work is made available under the Creative Commons Attribution-ShareAlike 4.0 International License (CC BY-SA). To view a copy of this license, visit [http://creativecommons.org/licenses/by-sa/4.0/](http://creativecommons.org/licenses/by-sa/4.0/) or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
 
-If you would like to notify unfoldingWord regarding your translation of this work, please contact us at [https://unfoldingword.org/contact/](https://unfoldingword.org/contact/).
+If you would like to notify unfoldingWord regarding your translation of this work, please contact us at [https://unfoldingword.org/contact/](https://unfoldingword.org/contact/).
+=======
+
+# 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 [license](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.
+>>>>>>> 256891b00dacf5dc9961466fde4b614a4269f4b2

manifest.json

@@ -25,7 +25,8 @@
 		"id": "reg"
 	},
 	"translators": [
-		"drc557"
+		"drc557",
+		"Georges"
 	],
 	"source_translations": [
 		{
@@ -64,6 +65,8 @@
 		"05-15",
 		"05-19",
 		"05-23",
-		"05-25"
+		"05-25",
+		"02-title",
+		"02-01"
 	]
 }