diff --git a/03/06.txt b/03/06.txt index 8988692..cfea6b3 100644 --- a/03/06.txt +++ b/03/06.txt @@ -1 +1,5 @@ -\v 6 Nije ichaki, ali Apolos bawi roeli, echi Riosi iyali echi ocherkoami. \v 7 ali ko, nopi icha ko siwachali, tapicho nopi ke roeko bawi ma pe a karunti ju. chopi Riosi ju mapu iya echi ocherkoami. \ No newline at end of file +<<<<<<< HEAD +\v 6 Nije ichaki, ali Apolos bawi roeli, echi Riosi iyali echi ocherkoami. \v 7 ali ko, nopi icha ko siwachali, tapicho nopi ke roeko bawi ma pe a karunti ju. chopi Riosi ju mapu iya echi ocherkoami. +======= +\v 6 Nije ichaki, ali Apolos bawi roeli, echi Riosi iyali echi ocherkoami. \v 7 ali ko, nopi icha ko siwachali, tapicho nopi ke roeko bawi ma pe a karunti ju. chopi Riosi ju mapu iya echi ocherkoami. +>>>>>>> 1c930af50ce3399381389a390066fe8ca7c1aa33 diff --git a/12/04.txt b/12/04.txt index 97abe7a..b741d7d 100644 --- a/12/04.txt +++ b/12/04.txt @@ -1 +1 @@ -\v 6 \v 4 jipi ko niru ne sinu nira omerkoami, nalina ne bilepi Onoruami Iwikala. \v 5 ne wika niru mapu ni nuleli nawisanla, nalina pe bilepi ju echi Riosi ko. ne wika namuti niru nochala, nalina riosiko pe karka omera. \ No newline at end of file +\v 4 jipi ko niru ne sinu nira omerkoami, nalina ne bilepi Onoruami Iwikala. \v 5 ne wika niru mapu ni nuleli nawisanla, nalina pe bilepi ju echi Riosi ko.\v 6 ne wika namuti niru nochala, nalina riosiko pe karka omera. \ No newline at end of file diff --git a/12/14.txt b/12/14.txt index 2bf7b8e..cf54b63 100644 --- a/12/14.txt +++ b/12/14.txt @@ -1 +1 @@ -\v 14 Echi ropokala ko ketasi pe chuwe ju. \v 15 ali ronola anisa: "mapu nije keni sukala ju, nije ketasi bi`iri ju echi ropokala jitra," ketasi pe echi jitra ju echi ropokala. \v 16 Echi nakala anisa: " churikar keni busila ju, ketasi ni bi`iri ju echi ropokala, " ketasi pe echi jitra ju pe echi ropokala iniala.\v 17 ali karka ropokala busila nisa ka, ¿kumi asimea echi namkoami? ali karka ropokala nisa ka bilepi nakala, ¿ kumi asimea echi Sakuami? \ No newline at end of file +\v 14 Echi ropokala ko ketasi pe chuwe ju. \v 15 ali ronola anisa: "mapu nije keni sukala ju, nije ketasi bi`iri ju echi ropokala jitra," ketasi pe echi jitra ju echi ropokala. \v 16 Echi nakala anisa: " churikar keni busila ju, ketasi ni bi`iri ju echi ropokala, " ketasi pe echi jitra ju pe echi ropokala iniala.\v 17 ali karka ropokala busila nisa ka, ¿kumi asimea echi namkoami? ali karka ropokala nisa ka bilepi nakala, ¿ kumi asimea echi sakuami? \ No newline at end of file diff --git a/12/21.txt b/12/21.txt index 21b4b4a..3f53a43 100644 --- a/12/21.txt +++ b/12/21.txt @@ -1 +1,5 @@ -\v 21 Echi busila ko ketasi omera me ane: " nije ketasi mi newale muje jitra." ketasi echi mo`ola je ane omera echi ronola: "nije mi newa`le." \v 22 Nopi echi ropokala uchuami ju jare ketasi me omera nopi jala suweti ju. \v 23 nopi jare uchua echi ropokalachi tamuje ko jela pe ke chukarami juti, tamuje ko iya ne bacha chukumea, nopi echi ke machirtami ju pe minapi a la ju. \v 24 Jipiko echi tamuje yua uchua ketasi nawale jala nateami nima, echi ma jala nateami ju, Riosi a napabuli echi yua uchuami, ali echi ko iyali bacha uchuma nopi chobiji a rika re. \ No newline at end of file +<<<<<<< HEAD +\v 21 Echi busila ko ketasi omera me ane: " nije ketasi mi newale muje jitra." ketasi echi mo`ola je ane omera echi ronola: "nije mi newa`le." \v 22 Nopi echi ropokala uchuami ju jare ketasi me omera nopi jala suweti ju. \v 23 nopi jare uchua echi ropokalachi tamuje ko jela pe ke chukarami juti, tamuje ko iya ne bacha chukumea, nopi echi ke machirtami ju pe minapi a la ju. \v 24 Jipiko echi tamuje yua uchua ketasi nawale jala nateami nima, echi ma jala nateami ju, Riosi a napabuli echi yua uchuami, ali echi ko iyali bacha uchuma nopi chobiji a rika re. +======= +\v 21 Echi busila ko ketasi omera me ane: " nije ketasi mi newale muje jitra." ketasi echi mo`ola je ane omera echi ronola: "nije mi newa`le." Nopi echi ropokala uchuami ju jare ketasi me omera nopi jala suweti ju.\v 22 nopi jare uchua echi ropokalachi tamuje ko jela pe ke chukarami juti, \v 23 tamuje ko iya ne bacha chukumea, nopi echi ke machirtami ju pe minapi a la ju. \v 24 Jipiko echi tamuje yua uchua ketasi nawale jala nateami nima, echi ma jala nateami ju, Riosi a napabuli echi yua uchuami, ali echi ko iyali bacha uchuma nopi chobiji a rika re. +>>>>>>> 1c930af50ce3399381389a390066fe8ca7c1aa33 diff --git a/12/25.txt b/12/25.txt index 173a40a..caca44f 100644 --- a/12/25.txt +++ b/12/25.txt @@ -1 +1,5 @@ -\v 25 echi ko niwali echirika a napabuli pachana ropokalachi, echi ropokala ko jala tibuma re pe aboni nira. \v 26 Mapali bile yua chukuami risu inilsa, karka nopi yua uchuami ju ayenacho risu inila. Mapali bile jala kaniltami yarami ju, ne sinemika jala kanila. \v 27 Jipi yemi echi kristo ropokala ju ali echi yua uchua mi ju ne ibili nira. \ No newline at end of file +<<<<<<< HEAD +\v 25 echi ko niwali echirika a napabuli pachana ropokalachi, echi ropokala ko jala tibuma re pe aboni nira. \v 26 Mapali bile yua chukuami risu inilsa, karka nopi yua uchuami ju ayenacho risu inila. Mapali bile jala kaniltami yarami ju, ne sinemika jala kanila. \v 27 Jipi yemi echi kristo ropokala ju ali echi yua uchua mi ju ne ibili nira. +======= +\v 25 echi ko niwali echirika a napabuli pachana ropokalachi, echi ropokala ko jala tibuma re pe aboni nira. \v 26 Mapali bile yua chukuami risu inilsa, karka nopi yua uchuami ju ayenacho risu inila. Mapali bile jala kaniltami yarami ju, ne sinemika jala kanila.\v 27 Jipi yemi echi kristo ropokala ju ali echi yua uchua mi ju ne ibili nira. +>>>>>>> 1c930af50ce3399381389a390066fe8ca7c1aa33 diff --git a/12/30.txt b/12/30.txt index 2ecba52..8550608 100644 --- a/12/30.txt +++ b/12/30.txt @@ -1 +1,5 @@ -\v 30 ¿karka yemi niwa echi sawekoami? ¿karka echi raicha wika raichali? ¿karka echi ko ku ruami ju mapu bile raicha? \v 31 ne iweri oloka asi echi echi Riosi mi omerli yama. ali nije mi ruirma bile buwe ne jala. \ No newline at end of file +<<<<<<< HEAD +\v 30 ¿karka yemi niwa echi sawekoami? ¿karka echi raicha wika raichali? ¿karka echi ko ku ruami ju mapu bile raicha? \v 31 ne iweri oloka asi echi echi Riosi mi omerli yama. ali nije mi ruirma bile buwe ne jala. +======= +\v 30 ¿karka yemi niwa echi sawekoami? ¿karka echi raicha wika raichali? ¿karka echi ko ku ruami ju mapu bile raicha?\v 31 ne iweri oloka asi echi echi Riosi mi omerli yama. ali nije mi ruirma bile buwe ne jala. +>>>>>>> 1c930af50ce3399381389a390066fe8ca7c1aa33 diff --git a/manifest.json b/manifest.json index e39b2fe..70c2a02 100644 --- a/manifest.json +++ b/manifest.json @@ -50,7 +50,6 @@ "03-title", "03-01", "03-03", - "03-06", "03-08", "03-10", "03-12", @@ -129,10 +128,7 @@ "12-12", "12-14", "12-18", - "12-21", - "12-25", "12-28", - "12-30", "13-title", "13-01", "13-04",