diff --git a/10/01.txt b/10/01.txt index eb3342f..ae41ec1 100644 --- a/10/01.txt +++ b/10/01.txt @@ -1 +1,5 @@ -\c 10 \v 1 Nije naki mapu iemi nachimeaba,rejimala,mapu tamuje onorua mochili echona bile pacha echona rirena norirari mina karka simarli echona walu bawilali. \v 2 karka suwaka anili pakotami echi Moisesi nira echona rirena norirari mina echona bawilali echiko, \v 3 mina karka suwaka cowali echi Riosi anila. \v 4 mapu karka suwaka bajili echi bajikuami echi Riosi anila. mapurika echi chapili mapu bilenchi rite mapu Riosi anila mapu najatli echi,mina echi rite anili echi Kristo. \ No newline at end of file +<<<<<<< HEAD +\c 10 \v 1 Nije naki mapu iemi nachimeaba,rejimala,mapu tamuje onorua mochili echona bile pacha echona rirena norirari mina karka simarli echona walu bawilali. \v 2 karka suwaka anili pakotami echi Moisesi nira echona rirena norirari mina echona bawilali echiko, \v 3 mina karka suwaka cowali echi Riosi anila. \v 4 mapu karka suwaka bajili echi bajikuami echi Riosi anila. mapurika echi chapili mapu bilenchi rite mapu Riosi anila mapu najatli echi,mina echi rite anili echi Kristo. +======= +\v 1 \v 2 \v 3 \v 4 1 Nije naki mapu iemi machimeaba,rejimala,mapu tamuje onorua mochili karka echona rirena norirari mina karka sinemka simarli echona walu bawilali. 2 karka suwabika pakota rua mapu echi Moisesi nira. 2 mina karka suwabika kowali echi bilempi kowami echi Riosi anila. 4 karka suwabika bajili echi bilepi Riosi anila. mapurika echi chapili echona rite atechi mapu Riosi inila mapu najatli iemi. mina echi rite anilariua echi Kristo. +>>>>>>> beeaa34f24be1e50031a64dd7d3adf1084b71b14 diff --git a/10/05.txt b/10/05.txt index a912fbb..ec1d351 100644 --- a/10/05.txt +++ b/10/05.txt @@ -1 +1,5 @@ -\v 5 chopi Riosi kie kala nirali wikabe echi ralamuli nira, mina echi ralamuli ropoka siwikami anili anilariua rejonarami echona huge akicheachi. \v 6 jipi anali karka anilariua bile inercuami mapu karka napawika,mapu chopi kie nakimeaba Charo olowami,mapu echi okuali. \ No newline at end of file +<<<<<<< HEAD +\v 5 chopi Riosi kie kala nirali wikabe echi ralamuli nira, mina echi ralamuli ropoka siwikami anili anilariua rejonarami echona huge akicheachi. \v 6 jipi anali karka anilariua bile inercuami mapu karka napawika,mapu chopi kie nakimeaba Charo olowami,mapu echi okuali. +======= +\v 5 \v 6 5 mapurika echi Riosi kie kanilika echikulariwa echi ayua,mina echi ropoka anilariua rejonarami echona iye okicheachi. 6 jipi anale ainilarua bile inercuami mapu tamuje nira, mapu kie nakibobati echi chati olowami, mapu echi okali. +>>>>>>> beeaa34f24be1e50031a64dd7d3adf1084b71b14 diff --git a/10/07.txt b/10/07.txt index 4c4e38c..0530dfa 100644 --- a/10/07.txt +++ b/10/07.txt @@ -1 +1,5 @@ -\v 7 osa makoi bikia imili kie inibo mapu karonti niwarami mapurika echi jare anili.jenale echiku echona sorutami:" ECHI RALAMULI MOCHUBILI ABONI MAPU KOMEABA MINA IRULI, MINA ABOBONI AJASLI MAPU RIYEKBO IRULI." \v 8 kie olabo echi chati mapu wika rejoi o muki ine echiko,mapurika echi jare echirika okuali.sine raweosa makoi bikia imili ralamuli siwilime echinira. \ No newline at end of file +<<<<<<< HEAD +\v 7 osa makoi bikia imili kie inibo mapu karonti niwarami mapurika echi jare anili.jenale echiku echona sorutami:" ECHI RALAMULI MOCHUBILI ABONI MAPU KOMEABA MINA IRULI, MINA ABOBONI AJASLI MAPU RIYEKBO IRULI." \v 8 kie olabo echi chati mapu wika rejoi o muki ine echiko,mapurika echi jare echirika okuali.sine raweosa makoi bikia imili ralamuli siwilime echinira. +======= +\v 7 \v 8 7 kie inibo echi karonti niwarami, mapu echijare echika anili. mapu jenale echi ju mapurika echona osorutami echiku:mapu echi ralamuli muchubili echona kosa mina bajisa karonti, MAPU AJASILI ECHONA JONSA MAPU RIYESA." kie chibi mokubo mapu kia rejoi o muki inena, mapu wika echirika okali. bile rawe asa makoi bakia mile wika ralamuli siwili mapu echi nira. +>>>>>>> beeaa34f24be1e50031a64dd7d3adf1084b71b14 diff --git a/10/09.txt b/10/09.txt index 47da32b..c65c9a0 100644 --- a/10/09.txt +++ b/10/09.txt @@ -1 +1,5 @@ -\v 9 kie echika uchebo echi Kristo,mapu wika echirika okali echi jare mina aboni anilariua chibi olarami echi sinowi te. \v 10 mapurika,kie chibi amigo, mapu wika echirika okali echika.mina mapu anilariua chibirika olarami echi analti kie kala rejoi mapu echi mokumeaba nira. \ No newline at end of file +<<<<<<< HEAD +\v 9 kie echika uchebo echi Kristo,mapu wika echirika okali echi jare mina aboni anilariua chibi olarami echi sinowi te. \v 10 mapurika,kie chibi amigo, mapu wika echirika okali echika.mina mapu anilariua chibirika olarami echi analti kie kala rejoi mapu echi mokumeaba nira. +======= +\v 9 \v 10 ayenacho kie uchebo bile inercuami echi Kristo, mapu wika echirika okali mina echi jiti chubi olati echi sinowite. 10 mapurika,kie chibi amigo,mapurika echi jare echirika okali,mina echi chubi olatarua echi nalti mukuami Riosi poi owola. +>>>>>>> beeaa34f24be1e50031a64dd7d3adf1084b71b14 diff --git a/10/11.txt b/10/11.txt index d1834a4..5580930 100644 --- a/10/11.txt +++ b/10/11.txt @@ -1 +1,5 @@ -\v 11 \v 12 \v 13 11 jipi, mapu echirika ikiya okali echi mapu inercuami nira anila rua mapu tamuje nira.anilarua osorutami mapu tamuje nira,tamuje nira,mapu echali echi isili chabenira. \ No newline at end of file +<<<<<<< HEAD +\v 11 \v 12 \v 13 11 jipi, mapu echirika ikiya okali echi mapu inercuami nira anila rua mapu tamuje nira.anilarua osorutami mapu tamuje nira,tamuje nira,mapu echali echi isili chabenira. +======= +\v 11 \v 12 \v 13 11 jipi, Jena echiko ikiya okali echi bile anatakuami ukurua mapu tamuje nira.anili osorutami mapu tamuje gala machimeaba mapu echi jiti, mapu tamuje nira, mapu echali juba nira nawali. 12 mapurika,mapu karka echi jerika anatasa gala alika inara gala anaka mapu kie rijuboubati. 13 kie iyira Chato isinkuami nawa mapurika jiti echi rejowachi echi ikiya asili.mapurika, Riosi ju echona inarami.echi kie nakima mapu tamuje aniboti mapu echona rijuboti mapu echona Chato olowami mapu echona kie omerachi. mapu echona hati isinkuami, echi binoi nijamara echi niyuscami, mapu tamuje anibobati gala anachami. +>>>>>>> beeaa34f24be1e50031a64dd7d3adf1084b71b14 diff --git a/10/14.txt b/10/14.txt new file mode 100644 index 0000000..39c4d87 --- /dev/null +++ b/10/14.txt @@ -0,0 +1 @@ +14 mapurika, tamuje kalerame, niyusi echi nali karonti niwarami jiti. 15 nijeko rahichine mapu bile rejoi gala anatami nira, mapurika tamuje omerbobati chubi aniya mapu tamuje anicho.16 echi basi mapu tamuje iyarame, ¿ kie ju mapu iya alala echi Kristo anila? echi Pani mapu rapankite, ¿ kie ju bile karonti naijakiami mapu echi Kristo rokala 17 mapurika echi niruli echi Pani sikiretami, tamuje, mapu juti wika, juti bilepi ropokala. mapurika karka suwabika uti echi Pani sikiretami sineamika.18 inesi echi ralamuli echona Israelchi piremi: ¿kie ju echi mapu kowa echi olarami mina bine echona bachami? 19 ¿ piri aniya echikuni Nije mapurika? ¿piri echi anali bile karonti niwarami karonti ju? ¿ o iche kowami mapu echi olarami mapu bile karonti niwarami karonti ju echi? 20 mapu Nije anine echi karonti mapu echi gala rejoi omowa kie bichili Riosi \ No newline at end of file diff --git a/10/18.txt b/10/18.txt new file mode 100644 index 0000000..e21589a --- /dev/null +++ b/10/18.txt @@ -0,0 +1 @@ +\v 18 \v 19 bachami19 ¿piri aniya echikuninije mapurika? ¿piri echi anali bile karonti niwarami karonti ju? ¿o iche kowami mapu echi olarami mapu bilekaronti niwarami karonti ju echi? 20 mapu Nije anine echi karonti mapu echi gala rejoi omowa kie bichili Riosi iche kowami, mapurika echi iya echi kowami echi siti kie kala ikua mapu \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md index 936c1bb..9ee74e1 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -2,6 +2,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -100,10 +101,13 @@ No warranties are given. The license may not give you all of the permissions nec ======= ======= >>>>>>> c320a050efe0dfc6d7b7b87228ea84486dcd0f88 +======= +>>>>>>> beeaa34f24be1e50031a64dd7d3adf1084b71b14 # 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. +<<<<<<< HEAD <<<<<<< HEAD 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/). @@ -118,3 +122,6 @@ If you would like to notify unfoldingWord regarding your translation of this wor >>>>>>> c320a050efe0dfc6d7b7b87228ea84486dcd0f88 ======= >>>>>>> edd63b28973144f994bbf69b4ac188144d932961 +======= +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/). +>>>>>>> beeaa34f24be1e50031a64dd7d3adf1084b71b14 diff --git a/manifest.json b/manifest.json index 5a4efff..b94a078 100644 --- a/manifest.json +++ b/manifest.json @@ -40,7 +40,8 @@ "Michael A. Rodriguez", "Elias Mancinas Perez ", "Karina Rojas Galeano", - "Ineyda Garcia Amador" + "Ineyda Garcia Amador", + "m" ], "finished_chunks": [ "02-title", @@ -58,10 +59,6 @@ "04-title", "05-title", "10-title", - "10-01", - "10-05", - "10-07", - "10-09", "11-title", "12-title", "12-01",