diff --git a/14/07.txt b/14/07.txt index 5ac7b9d..5c81366 100644 --- a/14/07.txt +++ b/14/07.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -\v 7 Echi simekuami ke akam aneami, echi rorirali echi arpa, ali echi ke aneami iseni aneami,¿churika machimea bire simekuami nari simea rorirali echi arpa? \v 8 Mapari echi kusuami simekuami bire namitami ke echi ju, ¿churika machi bire mapali masebili ma kariwesi echi nakoli? \v 9 Ari emi .Raichasa karunti namuti raichasa ke machika,¿churica omeri bire nama echi aniwami emi? mochibo raicha, ke wesi mi namima. -======= -\v 7 Echi simekuami ke akam aneami, echi rorirali echi arpa, ali echi ke aneami iseni aneami,¿churika machimea bire simekuami nari simea rorirali -echi arpa? \v 8 Mapari echi kusuami simekuami bire -namitami ke echi ju, ¿churika machi bire mapali masebili ma kariwesi echi nakoli? \v 9 Ari emi .Raichasa karunti namuti raichasa ke machika,¿churica omeri bire -nama echi aniwami emi? mochibo raicha, ke wesi mi -namima. ->>>>>>> a328c6ee6f0a8c8f37e7fa88ee83f48782ef5ae1 +\v 7 Echi simekuami ke akam aneami, echi rorirali echi arpa, ali echi ke aneami iseni aneami,¿churika machimea bire simekuami nari simea rorirali echi arpa? \v 8 Mapari echi kusuami simekuami bire namitami ke echi ju, ¿churika machi bire mapali masebili ma kariwesi echi nakoli? \v 9 Ari emi .Raichasa karunti namuti raichasa ke machika,¿churica omeri bire nama echi aniwami emi? mochibo raicha, ke wesi mi namima. \ No newline at end of file diff --git a/14/17.txt b/14/17.txt index eb8dbc4..00a0f70 100644 --- a/14/17.txt +++ b/14/17.txt @@ -1,8 +1 @@ -<<<<<<< HEAD -\v 17 Emiko ne bichiwika nira niwa ara a matetari a,ari chujare ramuli ke ocherili. \v 18 Matetari a echi riosi raichali oche sine raichari simirica emi yua. \v 19 Ari echona bichiwami neko naki raichanili mari raichari bino namika kiti omerima riwea chujare, echi mari miri raichara chu sinu raichari. -======= -\v 17 Emiko ne bichiwika nira niwa ara a matetari a,ari chujare ramuli ke ocherili. \v 18 Matetari a echi riosi raichali oche sine raichari simirica emi yua. - \v 19 Ari echona bichiwami neko naki raichanili mari raichari -bino namika kiti omerima riwea chujare, echi mari miri -raichara chu sinu raichari. ->>>>>>> a328c6ee6f0a8c8f37e7fa88ee83f48782ef5ae1 +\v 17 Emiko ne bichiwika nira niwa ara a matetari a,ari chujare ramuli ke ocherili. \v 18 Matetari a echi riosi raichali oche sine raichari simirica emi yua. \v 19 Ari echona bichiwami neko naki raichanili mari raichari bino namika kiti omerima riwea chujare, echi mari miri raichara chu sinu raichari. \ No newline at end of file diff --git a/14/22.txt b/14/22.txt index 1052f9a..164353e 100644 --- a/14/22.txt +++ b/14/22.txt @@ -1,7 +1,3 @@ -<<<<<<< HEAD -\v 22 Echi jiti, chu sinu raichali echiju riwiritami, ke echi bichiwami, ayenacho echi ke bichiwami. Echi riweami riwiritami, ke echi ke bichiwami, ayenacho echi bichiwami. \v 23 Ayena, ayena cho, sineami echi bihiwami napawima sineami raichama echi sinu raichali, ali moimea echi ke bichiwami, ¿ke animea emi -======= \v 22 Echi jiti, chu sinu raichali echiju riwiritami, ke echi bichiwami, ayenacho echi ke bichiwami. Echi riweami riwiritami, ke echi ke bichiwami, ayenacho echi bichiwami. \v 23 Ayena, ayena cho, sineami echi bichiwami napawima sineami raichama echi sinu raichali, ali moimea echi ke bichiwami, ¿ke animea emi ->>>>>>> a328c6ee6f0a8c8f37e7fa88ee83f48782ef5ae1 ke natami? \ No newline at end of file diff --git a/14/24.txt b/14/24.txt index a4eaf2a..46cc288 100644 --- a/14/24.txt +++ b/14/24.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 24 Ari sineami emi mochiri riwea moimea echi ke bichiwami weko birepi weko machi, nima werili anerami sineami emi. Nimare ku binoi ku natama ka la nira kara su waba namuti mapu iki namali. Jipi iki ke machirutamiechona sulaka nima riwiritami. \v 25 Echi jiti, chomi bachami chokobika wikaranima echi riosi. -======= -\v 24 Ari sineami emi mochiri riwea moimea echi ke bichiwami weko birepi weko machi, nima werili anerami sineami emi. Nimare ku binoi ku natama ka la -nira kara su waba namuti mapu iki namali. \v 25 Jipi iki ke machirutamiechona sulaka nima riwiritami. Echi jiti, chomi bachami chokobika wikaranima echi riosi. ->>>>>>> a328c6ee6f0a8c8f37e7fa88ee83f48782ef5ae1 -Machina machiritamiechi riosi bichiwika emi nira. \ No newline at end of file +\v 24 Ari sineami emi mochiri riwea moimea echi ke bichiwami weko birepi weko machi, nima werili anerami sineami emi. Nimare ku binoi ku natama ka la nira kara su waba namuti mapu iki namali. \v 25 Jipi iki ke machirutamiechona sulaka nima riwiritami. Echi jiti, chomi bachami chokobika wikaranima echi riosi. Machina machiritamiechi riosi bichiwika emi nira. \ No newline at end of file diff --git a/15/20.txt b/15/20.txt index 6ad6db1..bcd7d9f 100644 --- a/15/20.txt +++ b/15/20.txt @@ -1 +1 @@ -\v 20 \v 21 1 CORINTIOS 15: 20,39. 20.- Jipi ko kristo nili' ku acharami echona mukuli chi, ni'ima'a aboni echi mukuli \v21 Ali nawali echi mukuwami bile rijoi jiti, Ali bile rijoi jiti ayenacho nawali ku asisoami Ali mukusa' \ No newline at end of file +\v 20 Jipi ko kristo nili' ku acharami echona mukuli chi, ni'ima'a aboni echi mukuli \v 21 Ali nawali echi mukuwami bile rijoi jiti, Ali bile rijoi jiti ayenacho nawali ku asisoami Ali mukusa' \ No newline at end of file diff --git a/manifest.json b/manifest.json index fa701d4..b98ed17 100644 --- a/manifest.json +++ b/manifest.json @@ -202,6 +202,15 @@ "14-37", "14-39", "15-title", + "15-01", + "15-03", + "15-05", + "15-08", + "15-10", + "15-12", + "15-15", + "15-18", + "15-20", "15-22", "15-24", "15-27",