diff --git a/16/01.txt b/16/01.txt index 4274c2e..5044761 100644 --- a/16/01.txt +++ b/16/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 16 \v 1 Ya José yepuadaca yasu weneiwica irii yai calii Jordán, ale idecunii Jericó nere, Jericó yasu uni, cunierii, sisade eri imusuateisecawa, iwaluacawa alede naisawalire, nairiecawa Jericó nese, yewiba yai Betel yasu dúli nenibaa. \v 2 Ya sisa Betel nese idecunii ale luz nere nachabacawa machacanita Atarot, nenibaa, arquitas yasu calii. -======= -\c 16 \v 1 Ya Jose yepuadacá yasu weneiwica irii yai calii Jordán, ale idecuni Jericó nere, Jericó yasu uni cunierri, sisade eeri imusuateisecawa, iwualacawa alede amisawalire, nairiecawa Jericó nese, yewiba yai Betel yasu dúlu nenibaa. \v 2 ya Sisa Betel nese idecumii ale Luz nere, nachabacawa machacanita Atarot nenibaa, arquitas yasu calii. ->>>>>>> ab43b5dab44b76fcd19453f8cc9768ea7d866879 +\c 16 \v 1 Ya Jose yepuadacá yasu weneiwica irii yai calii Jordán, ale idecuni Jericó nere, Jericó yasu uni cunierri, sisade eeri imusuateisecawa, iwualacawa alede amisawalire, nairiecawa Jericó nese, yewiba yai Betel yasu dúlu nenibaa. \v 2 ya Sisa Betel nese idecumii ale Luz nere, nachabacawa machacanita Atarot nenibaa, arquitas yasu calii. \ No newline at end of file diff --git a/16/03.txt b/16/03.txt index dd092e2..431e8a6 100644 --- a/16/03.txt +++ b/16/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Ya nese nalicuacawa jafletitas yasu calii nere eri idapocanamiwa, alede caliaculee Bet Horón nese caita nanaca alede Gezer nere; imalacawa uni manuiri puiweri iweree. \v 4 Caicata icacanawa, Manasés Efraín nedaca yai nanirii José yepuaderica nali yasucawa. -======= -\v 3 Ya nese nalicuacawa Jafletitas yasu calii nere eeri idapocanamiwa, Alede caliaculee Bet Horón nese caita nanaca Alede Gezer nere;imalacawa uni manuiri piweri iweree. \v 4 Caicata icacanawa, Manasés, Efraín nedaca yai nanirii José Yepuaderica nali yasucawa. ->>>>>>> ab43b5dab44b76fcd19453f8cc9768ea7d866879 +\v 3 Ya nese nalicuacawa Jafletitas yasu calii nere eeri idapocanamiwa, Alede caliaculee Bet Horón nese caita nanaca Alede Gezer nere;imalacawa uni manuiri piweri iweree. \v 4 Caicata icacanawa, Manasés, Efraín nedaca yai nanirii José Yepuaderica nali yasucawa. \ No newline at end of file diff --git a/16/05.txt b/16/05.txt index 6b9bb35..8082550 100644 --- a/16/05.txt +++ b/16/05.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 5 Ya Efraín yedaca yasu weneiwica iriwa - iyuwata yanawaca yai abeeri calii imala cateicawa imaquerica Atarot Adar nese, Bet Horón chenibaa. \v 6 nese nacawaa napichalewa uni manuirii nere idecuni nere Micmetat, depuawalee, nacapowaca chabaa tanat siló iwalibaa, nachabacawa Janoa nere idecuni. \v 7 Janoa nese nalicuacawa alede Atarot, Naarat, caita nadecawa alede Jericó nere, nanacate Jordán nere idecunii. -======= -\v 5 Ya Efraín yedaca yasu weneiwica iriwa iyuwata yanawaca yai abeeri calii imalacateicawa imaquerica Atarot Adar nese, Bet Horón chenibaa \v 6 nese nacawaa napichalewa uni manuiri nere idecuni nere. Mirmetat depuawalee, nacapowaca chabaa Tanat Siló iwalibaa, nachabacawa Janoa nere idecuni. \v 7 Janoa nese nalicuacawa alede Atarot Naarat, caita nadrecawa alede Jericó nere, nanacate Jordán nere idecunii. ->>>>>>> ab43b5dab44b76fcd19453f8cc9768ea7d866879 +\v 5 Ya Efraín yedaca yasu weneiwica iriwa iyuwata yanawaca yai abeeri calii imalacateicawa imaquerica Atarot Adar nese, Bet Horón chenibaa \v 6 nese nacawaa napichalewa uni manuiri nere idecuni nere. Mirmetat depuawalee, nacapowaca chabaa Tanat Siló iwalibaa, nachabacawa Janoa nere idecuni. \v 7 Janoa nese nalicuacawa alede Atarot Naarat, caita nadrecawa alede Jericó nere, nanacate Jordán nere idecunii. \ No newline at end of file diff --git a/16/08.txt b/16/08.txt index dd260b9..e7f3122 100644 --- a/16/08.txt +++ b/16/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Tapúa nese abeeri calii inumami yai caná yanabacaa, imalacawa uni manuirii iweree yacate Efraín yasu iwitána, yepuaderica nalii nía yenaneicawa. \v 9 Yapicha yai yacalee manuinameri, nederica nalii nía, Efraín, Manasés yenaneica, macaita yapicha yai yacalee, caide iyuwa yapicha yai nasu callii nayacataica. -======= -\v 8 Tapúa nese abeeri calii inumami yai Caná yanabacaa, imalacawa uni manuirii iweree Yacate Efraiín yasu iwitána, yepuaderica nalii nia yenaneicawa. \v 9 Yapicha yai yacalee manuinameri, nederica nalii nia, Efraín, Manasés yenaneica, macaita yapicha yai yacalee, caide iyuwa yapicha yai nasu calii nayacataica. ->>>>>>> ab43b5dab44b76fcd19453f8cc9768ea7d866879 +\v 8 Tapúa nese abeeri calii inumami yai Caná yanabacaa, imalacawa uni manuirii iweree Yacate Efraiín yasu iwitána, yepuaderica nalii nia yenaneicawa. \v 9 Yapicha yai yacalee manuinameri, nederica nalii nia, Efraín, Manasés yenaneica, macaita yapicha yai yacalee, caide iyuwa yapicha yai nasu calii nayacataica. \ No newline at end of file diff --git a/16/10.txt b/16/10.txt index dc613e3..967e4ac 100644 --- a/16/10.txt +++ b/16/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Ya namusuadaca naichawa nía cananeos, iyeicate Gezer neni, ya nese nía cananeos iyaca Efraín iricu siucalenama, ya nía weneiwica nachuliaca naibeidaca imierii ibeidacalesi chainisirii. -======= -\v 10 ya namusuadaca naichawa nía Cananeos, iyeicate Gezer neni, ya nese nia Cananeos iyaca Efraín iricu Siucalenama, ya nia Weneiwica nachuliaca naibeidaca imierii ibeidacalesi Chainisirii ->>>>>>> ab43b5dab44b76fcd19453f8cc9768ea7d866879 +\v 10 ya namusuadaca naichawa nía Cananeos, iyeicate Gezer neni, ya nese nia Cananeos iyaca Efraín iricu Siucalenama, ya nia Weneiwica nachuliaca naibeidaca imierii ibeidacalesi Chainisirii \ No newline at end of file diff --git a/16/title.txt b/16/title.txt new file mode 100644 index 0000000..ea96226 --- /dev/null +++ b/16/title.txt @@ -0,0 +1 @@ +Capitulo 16 \ No newline at end of file