diff --git a/03/21.txt b/03/21.txt index ef2632b..843b668 100644 --- a/03/21.txt +++ b/03/21.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 21 Jipiko rojaka echi nulali,echi rika nateami ju Riosi jara maki ruami ju.jena ju echi Riosi jiti nulerami ràichanla, \v 22 Jena ju mapu nulali echi Riosi echi jara bichicuami echi walubela kristo Suwaba mapu jara bichiko.onoruami jiti kie ju bile we nateami Suwaba chopi rika ine echi Riosi Ali bile chabo chi o ralamuli. -======= -\v 21 \v 22 21-Jipiko rojaka echi nulali,echi rika nateami ju Riosi jara maki ruami ju.jena ju echi Riosi jiti nulerami ràichanla,. -22-Jena ju mapu nulali echi Riosi echi jara bichicuami echi walubela kristo Suwaba mapu jara bichiko.onoruami jiti kie ju bile we nateami Suwaba chopi rika ine echi Riosi Ali bile chabo chi o ralamuli. ->>>>>>> 4720cdce45a67f34f1f21910b9ef5a1762709e08 +\v 21 Jipiko rojaka echi nulali,echi rika nateami ju Riosi jara maki ruami ju.jena ju echi Riosi jiti nulerami ràichanla, \v 22 Jena ju mapu nulali echi Riosi echi jara bichicuami echi walubela kristo Suwaba mapu jara bichiko.onoruami jiti kie ju bile we nateami Suwaba chopi rika ine echi Riosi Ali bile chabo chi o ralamuli. \ No newline at end of file diff --git a/03/23.txt b/03/23.txt index 5ae62d9..cf66ede 100644 --- a/03/23.txt +++ b/03/23.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 23 Suwaba ju Chati olami kie sibama echi we simati echi Riosi jiti. \v 24 Aboni ju nikili nira mapurika nulerami ju echi gara kuirtami nira echi kristo Jesusi jiti. -======= -\v 23 \v 24 23 Suwaba ju Chati olami kie sibama echi we simati echi Riosi jiti. -24- Aboni ju nikili nira mapurika nulerami ju echi gara kuirtami nira echi kristo Jesusi jiti. ->>>>>>> 4720cdce45a67f34f1f21910b9ef5a1762709e08 +\v 23 Suwaba ju Chati olami kie sibama echi we simati echi Riosi jiti. \v 24 Aboni ju nikili nira mapurika nulerami ju echi gara kuirtami nira echi kristo Jesusi jiti. \ No newline at end of file diff --git a/03/25.txt b/03/25.txt index 6c034fc..976cb19 100644 --- a/03/25.txt +++ b/03/25.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 25 Ali echi Riosi nijima tamuje echi jiti achali echi Tami Kuirami Ali ni bichika nira ku biwarami ju echi onorumi jiti Ala.binoi ni jili Kristo mapurika olarami nira,mina Ripa ju echi Chati Olakuami echi chabe jonsa. \v 26 We kili nira. mapurika jena simili echirika riwirtami nima mapu kariweka echi ne bacha nira.je na nili pi riwirkuami nira echi binoi nira, Ali mi riwirma echi ju pita namuti mi anemare mapu wika namuti simirsa echi bichika inarkua echi Jesusi. -======= -\v 25 \v 26 25-Ali echi Riosi nijima tamuje echi jiti achali echi Tami Kuirami Ali ni bichika nira ku biwarami ju echi onorumi jiti Ala.binoi ni jili Kristo mapurika olarami nira,mina Ripa ju echi Chati Olakuami echi chabe jonsa. -26-We kili nira. mapurika jena simili echirika riwirtami nima mapu kariweka echi ne bacha nira.je na nili pi riwirkuami nira echi binoi nira, Ali mi riwirma echi ju pita namuti mi anemare mapu wika namuti simirsa echi bichika inarkua echi Jesusi. ->>>>>>> 4720cdce45a67f34f1f21910b9ef5a1762709e08 +\v 25 Ali echi Riosi nijima tamuje echi jiti achali echi Tami Kuirami Ali ni bichika nira ku biwarami ju echi onorumi jiti Ala.binoi ni jili Kristo mapurika olarami nira,mina Ripa ju echi Chati Olakuami echi chabe jonsa. \v 26 We kili nira. mapurika jena simili echirika riwirtami nima mapu kariweka echi ne bacha nira.je na nili pi riwirkuami nira echi binoi nira, Ali mi riwirma echi ju pita namuti mi anemare mapu wika namuti simirsa echi bichika inarkua echi Jesusi. \ No newline at end of file diff --git a/03/27.txt b/03/27.txt index 2f5b081..873981e 100644 --- a/03/27.txt +++ b/03/27.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 27 ¿co mi ati echi wekanil kuami?echirika Ani¿churika ocherili?¿ chabe jonsa? kie, churika ocherili echi bichicuami. \v 28 tamuje ko mapurika ola,bile rijimala mapurika anerami ju nijara bichika, muje kie olasa mapurika nulerami nira echi noruami raichali jiti. -======= -\v 27 \v 28 27-¿Comi ati echi we nochili?echirika Ani¿churika ocherili?¿ mapu muje ola? kie, churika nawali echi jara bikicuami -28 -tamuje ko mapurika ola,bile rijimala mapurika anerami ju nijara bichika, muje kie olasa mapurika nulerami nira echi noruami raichali jiti. ->>>>>>> 4720cdce45a67f34f1f21910b9ef5a1762709e08 +\v 27 ¿co mi ati echi wekanil kuami?echirika Ani¿churika ocherili?¿ chabe jonsa? kie, churika ocherili echi bichicuami. \v 28 tamuje ko mapurika ola,bile rijimala mapurika anerami ju nijara bichika, muje kie olasa mapurika nulerami nira echi noruami raichali jiti. \ No newline at end of file diff --git a/03/29.txt b/03/29.txt index 66c4c4f..0a4ec69 100644 --- a/03/29.txt +++ b/03/29.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 29 ¿ Echi ju Riosi Ali bile pi Riosi echi juriosi niwa li?¿kie ju echi binoi Riosi ni wali echi ralamuli? echi ralamuli nai pireami. \v 30 Echirika nisa bilepi riosi,echi mi Anema mapurika olama muje Riosi jiti nulerami ju echirika ni jara bichika, mapurika nulerami nira echi Riosi jiti echirika olali aboni ni pachana Sulachi jonsa nira bichika. -======= -\v 29 \v 30 29¿ Echi ju Riosi Ali bile pi Riosi echi juriosi bilepi nira?¿kie ju echi binoi Riosi ni wali echi ralamuli? echi ralamuli nai pireami. -30-Echirika nisa bilepi riosi,echi mi Anema mapurika olama muje Riosi jiti nulerami ju echirika ni jara bichika, mapurika nulerami nira echi Riosi jiti echirika olali aboni ni pachana Sulachi jonsa nira bichika. ->>>>>>> 4720cdce45a67f34f1f21910b9ef5a1762709e08 +\v 29 ¿ Echi ju Riosi Ali bile pi Riosi echi juriosi niwa li?¿kie ju echi binoi Riosi ni wali echi ralamuli? echi ralamuli nai pireami. \v 30 Echirika nisa bilepi riosi,echi mi Anema mapurika olama muje Riosi jiti nulerami ju echirika ni jara bichika, mapurika nulerami nira echi Riosi jiti echirika olali aboni ni pachana Sulachi jonsa nira bichika. \ No newline at end of file diff --git a/03/31.txt b/03/31.txt index b145cf8..409161a 100644 --- a/03/31.txt +++ b/03/31.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 31 Echirika¿chabe ko jirika nili echi bile rijol nulerami jili mapurika olama Echirika bichika nira?¡makie sine Nina mapurika nili chabe rawe! jipi ko jara nira ku natasi Ali ku bichika echi noruami raichali. -======= -\v 31 31- Echirika¿nijima echi jara raichali echi noruami jiti Echirika ni bichika nira?¡makie sine Nina mapurika nili chabe rawe! jipi ko jara nira ku natasi Ali ku bichika echi noruami raichali. ->>>>>>> 4720cdce45a67f34f1f21910b9ef5a1762709e08 +\v 31 Echirika¿chabe ko jirika nili echi bile rijol nulerami jili mapurika olama Echirika bichika nira?¡makie sine Nina mapurika nili chabe rawe! jipi ko jara nira ku natasi Ali ku bichika echi noruami raichali. \ No newline at end of file diff --git a/04/01.txt b/04/01.txt index 877dc50..719de64 100644 --- a/04/01.txt +++ b/04/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 4 \v 1 Aliko, ¿chorika omerile, channe echi Abrahami, nopirika chabe nira,a binoi sapala, riwali? \v 2 Napirika Abrahami ko nilampa ala wikawarame nopiri olali, binoi ko nimare bile ala machiwame ma ala kanilkuame ali pi ke Riosi nira,a. \v 3 ¿Ali cho ani echi osorutami? "ABRAHAMI BICHILI RIOSI ALI ECHIRIKA ANIRUTAMI NILI ALA KALARRAMI" -======= -\c 4 \v 1 Nije a ni ne ala wichiwa echi Kristo. Nije ke akale, ali nije natali aniwame minowi niraga tami yuga echi Riosi iwigala. \v 2 Nopiria nije niraga ne walu omonli niru ke sine wiliwa oko echi nije sulachi. \v 3 Chopi nije omera nakisa nopiria nije binowi nije niraga we siti nije niraga wanajitame echi Kristo ne a la niraga nije rijimala jare echi aboni ne tamuje yuka sapala. ->>>>>>> c51f317e80b92a890c290afc6e331182360d103c +\c 4 \v 1 Aliko, ¿chorika omerile, channe echi Abrahami, nopirika chabe nira,a binoi sapala, riwali? \v 2 Napirika Abrahami ko nilampa ala wikawarame nopiri olali, binoi ko nimare bile ala machiwame ma ala kanilkuame ali pi ke Riosi nira,a. \v 3 ¿Ali cho ani echi osorutami? "ABRAHAMI BICHILI RIOSI ALI ECHIRIKA ANIRUTAMI NILI ALA KALARRAMI" \ No newline at end of file diff --git a/04/04.txt b/04/04.txt index 09a6912..c77484d 100644 --- a/04/04.txt +++ b/04/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Jipiko no piri nochiko ni ala nira,a ke tararamí ju nopirika bile iyarame ali nopirika kaya iensa. \v 5 Ali nopi iri ke olasa ke biri nochika ali echona, a niraka bichiwi echi nopiri wikawi chati olami ali echi bichiwami aniruami ju ala kalaratame. -======= -\v 4 \v 5 Echiriga ji Israelita ->>>>>>> c51f317e80b92a890c290afc6e331182360d103c +\v 4 Jipiko no piri nochiko ni ala nira,a ke tararamí ju nopirika bile iyarame ali nopirika kaya iensa. \v 5 Ali nopi iri ke olasa ke biri nochika ali echona, a niraka bichiwi echi nopiri wikawi chati olami ali echi bichiwami aniruami ju ala kalaratame. \ No newline at end of file diff --git a/04/title.txt b/04/title.txt index 31ec8b4..7e7c258 100644 --- a/04/title.txt +++ b/04/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Naó Rojanarami. -======= -Kaitulo 9 ->>>>>>> c51f317e80b92a890c290afc6e331182360d103c +Naó Rojanarami. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 635bf62..bc4f45e 100644 --- a/manifest.json +++ b/manifest.json @@ -80,6 +80,16 @@ "03-11", "03-13", "03-15", + "03-19", + "03-21", + "03-23", + "03-25", + "03-27", + "03-29", + "03-31", + "04-title", + "04-01", + "04-04", "04-06", "04-09", "04-11",