From 5149f2f2dc458840d38edebe2330d2401f9ecb7c Mon Sep 17 00:00:00 2001 From: michael_rodriguez Date: Fri, 9 Jul 2021 18:24:09 -0400 Subject: [PATCH] Fri Jul 09 2021 18:24:08 GMT-0400 (Eastern Daylight Time) --- 01/01.txt | 6 +--- 01/04.txt | 6 +--- 01/07.txt | 6 +--- 01/10.txt | 6 +--- 01/12.txt | 6 +--- 01/title.txt | 6 +--- 02/title.txt | 6 +--- 03/06.txt | 6 +--- manifest.json | 79 ++++++++++++++++++++++++++++----------------------- 9 files changed, 51 insertions(+), 76 deletions(-) diff --git a/01/01.txt b/01/01.txt index e3f19a9..e113c1b 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 Pablo, ucharami kristo Jesusi mapo rija nawisama mapo riga ani onoruami, kuirali echi rijimala, \v 2 echi Iglesia riosi echona korinto, aboni ma biwarami nili kristo Jesusi , ayerami nili' ni'ima pueblochi Jala. Tamuje ayenacho asali osowa karika Tanika onoruami rala jiti karika buchuwini, nije niwali jesukristo . \v 3 yarami echi Kili' nira riosi ni 'wali onoruami jesukristo ni'ima yemi' yua'. -======= -\c 1 \v 1 Pablo Bayerami nili Jesukristo jiti Bile apostol nimamoa echiriga Riosi nirak nima, rijimari, \v 2 echona Napawikuachi echona Corinto enkuachi echi Kristo we santo inili. Tamuje ayenacho ichiriga osoya mapi carki bayere echi onoruame karga buchuwini echi onoruame walubeala. \v 3 Echi natetari ali Kanilkuam echi onoruame yua iyem nisare. ->>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 +\c 1 \v 1 Pablo, ucharami kristo Jesusi mapo rija nawisama mapo riga ani onoruami, kuirali echi rijimala, \v 2 echi Iglesia riosi echona korinto, aboni ma biwarami nili kristo Jesusi , ayerami nili' ni'ima pueblochi Jala. Tamuje ayenacho asali osowa karika Tanika onoruami rala jiti karika buchuwini, nije niwali jesukristo . \v 3 yarami echi Kili' nira riosi ni 'wali onoruami jesukristo ni'ima yemi' yua'. \ No newline at end of file diff --git a/01/04.txt b/01/04.txt index 8e1e8d7..979a1c3 100644 --- a/01/04.txt +++ b/01/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Sinibi naterara ya riosi yemi' jiti,echi jiti riosi ,gala kale yali binoy rawala ji'ti \v 5 Binoi niraa yali, riosi nijili'i we nateami ijala mapu raichami ni'ima machiwawami, \v 6 Muje raichali ma'a riwirtami nili'. -======= -\v 4 Nije chulubi natetara iya echi binoi onoruame mapuriga emi nira´a, map riga Binoy onoruami echi Jesusi nijilampa tamoje i´ya´a. \v 5 Binoi ka´la mi yali wika namuti wabe simá rika, wabe ka´la machika ra´ichami alí wabe ka´la machím karunt namuti jiti, \v 6 ayenacho mapurika echi wabe ka´la ra´ichalí echi Kristo jiti ne we ka´la bichiwali nirá ruwerami ju yemi. ->>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 +\v 4 Nije chulubi natetara iya echi binoi onoruame mapuriga emi nira´a, map riga Binoy onoruami echi Jesusi nijilampa tamoje i´ya´a. \v 5 Binoi ka´la mi yali wika namuti wabe simá rika, wabe ka´la machika ra´ichami alí wabe ka´la machím karunt namuti jiti, \v 6 ayenacho mapurika echi wabe ka´la ra´ichalí echi Kristo jiti ne we ka´la bichiwali nirá ruwerami ju yemi. \ No newline at end of file diff --git a/01/07.txt b/01/07.txt index d6586e9..3645311 100644 --- a/01/07.txt +++ b/01/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Echiriga, yemi' niwi karika igala kristo maporiga buwe echi jesukristo ku nawama. \v 8 Binoi nijima jiweroami ni'i juba' , maporiga ke ni'ima chati olaloami ali' ku nawasa jesukristo. \v 9 riosi we kala ju, Binoi bayeli raichaga ranala'a , walubela kristo. -======= -\v 7 Map riga i´yemi ke biri a la aliwemi ju, map ali buyesatm kanilka nira´a echi onoruame. \v 8 Echi ayenacho echiriga olamare jubarawe, mapuriga ke wesi chokila inimampa echi rawe binoy onoruame ku nawalachi. \v 9 Binoy echi Riosi ko ni wabe gara ju. Map echi bayeri ko echi ranara yua Jesusi nira´a. ->>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 +\v 7 Map riga i´yemi ke biri a la aliwemi ju, map ali buyesatm kanilka nira´a echi onoruame. \v 8 Echi ayenacho echiriga olamare jubarawe, mapuriga ke wesi chokila inimampa echi rawe binoy onoruame ku nawalachi. \v 9 Binoy echi Riosi ko ni wabe gara ju. Map echi bayeri ko echi ranara yua Jesusi nira´a. \ No newline at end of file diff --git a/01/10.txt b/01/10.txt index 07327ac..131f65f 100644 --- a/01/10.txt +++ b/01/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 jipi mi anema'a yemi', rijimala, tanama' riosi rawala ji'ti , aboni Jala anisa'a,. ke rojasa yemi'. Nije ane'e natasi napawika bilepi mo'oli nira'a bilepi nataga. \v 11 Ali je rika ni'mare , nije rijimala , echi ralamuli kloe niru'u nasipi rojaka aboni'i nira . -======= -\v 10 Ali Jipiko chanema iyemi, rijimara Binoy Jesukristo nira´a echiriga Bilempi nira´a anataga isispo. Ali ke wika nira´a ali nule karka napawika bilempi nira´a anataka iyempo. \v 11 Ali echiriga ma ala tibisa, nije rijimara karka echomi pire´ame napawika iyemi nira´a. ->>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 +\v 10 Ali Jipiko chanema iyemi, rijimara Binoy Jesukristo nira´a echiriga Bilempi nira´a anataga isispo. Ali ke wika nira´a ali nule karka napawika bilempi nira´a anataka iyempo. \v 11 Ali echiriga ma ala tibisa, nije rijimara karka echomi pire´ame napawika iyemi nira´a. \ No newline at end of file diff --git a/01/12.txt b/01/12.txt index 7eb4edf..6ac44b6 100644 --- a/01/12.txt +++ b/01/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Jipi Jena ji'ti anime : ibilini nira yemi ani : " nije yua ju Pablo" , ali " nije yua ju apolos" , ali " nije yua ju sefas" , ali " nije yua ju kristo. " \v 13 ¿ Ju kristo okona rojonarami ? ¿ ni'ili yemi pagotami Pablo rawala ji'ti? -======= -\v 12 Ali echiriga animea: Karka suwaba iyemi ibili nira echani: "Nije echi Pablo yuha ju", o la "Nije echi Apolos yuha ju", o la "Nije echi Cristo yuhá jú." \v 13 ¿Ali Kristo ko walubeala ju? ¿Echi Pablo michontame nili emti nira´a? ¿Pagotame nilire echi Pablo raola nira´a? ->>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 +\v 12 Ali echiriga animea: Karka suwaba iyemi ibili nira echani: "Nije echi Pablo yuha ju", o la "Nije echi Apolos yuha ju", o la "Nije echi Cristo yuhá jú." \v 13 ¿Ali Kristo ko walubeala ju? ¿Echi Pablo michontame nili emti nira´a? ¿Pagotame nilire echi Pablo raola nira´a? \ No newline at end of file diff --git a/01/title.txt b/01/title.txt index b29e623..b74ca25 100644 --- a/01/title.txt +++ b/01/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Bile Rojanarami. -======= -Rojanarami 1 ->>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 +Bile Rojanarami. \ No newline at end of file diff --git a/02/title.txt b/02/title.txt index cf84ca3..9d6d48f 100644 --- a/02/title.txt +++ b/02/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Okua Rojanarami. -======= -Rojanarami 2 ->>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 +Okua Rojanarami. \ No newline at end of file diff --git a/03/06.txt b/03/06.txt index cfea6b3..8988692 100644 --- a/03/06.txt +++ b/03/06.txt @@ -1,5 +1 @@ -<<<<<<< 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 +\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 diff --git a/manifest.json b/manifest.json index ba986bd..3a00853 100644 --- a/manifest.json +++ b/manifest.json @@ -48,6 +48,29 @@ "cesar reyes fuentes" ], "finished_chunks": [ + "01-title", + "01-01", + "01-04", + "01-07", + "01-10", + "01-12", + "01-14", + "01-17", + "01-18", + "01-20", + "01-22", + "01-24", + "01-26", + "01-28", + "01-30", + "02-title", + "02-01", + "02-03", + "02-06", + "02-08", + "02-10", + "02-12", + "02-14", "03-title", "03-01", "03-03", @@ -116,41 +139,6 @@ "09-24", "10-title", "11-title", - "12-title", - "12-01", - "12-04", - "12-07", - "12-09", - "12-12", - "12-14", - "12-18", - "12-28", - "13-title", - "13-01", - "13-04", - "14-title", - "15-title", - "16-title", - "16-01", - "16-03", - "16-05", - "16-07", - "01-14", - "01-17", - "01-18", - "01-20", - "01-22", - "01-24", - "01-26", - "01-28", - "01-30", - "02-01", - "02-03", - "02-06", - "02-08", - "02-10", - "02-12", - "02-14", "11-01", "11-05", "11-07", @@ -164,6 +152,19 @@ "11-27", "11-31", "11-33", + "12-title", + "12-01", + "12-04", + "12-07", + "12-09", + "12-12", + "12-14", + "12-18", + "12-28", + "13-title", + "13-01", + "13-04", + "14-title", "14-01", "14-05", "14-07", @@ -179,6 +180,12 @@ "14-31", "14-34", "14-37", - "14-39" + "14-39", + "15-title", + "16-title", + "16-01", + "16-03", + "16-05", + "16-07" ] } \ No newline at end of file