diff --git a/15/01.txt b/15/01.txt index 77611f4..024bd6a 100644 --- a/15/01.txt +++ b/15/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 15 \v 1 M+ta tawari tixa+ netiuxei taheima, kunie ti aneme: muwa mekanierekai atahuta akeritsix+ atahuta me aha+ritat+ tsitiyuruwame, m+k+ hik+t+kai tsitiyuruwame kuinat+me m+k+k+ paya anikiekai Kaka+yari hax+aya. -======= -\c 15 \v 1 Hapa+nata nepuxei ti'hek+a taheima manakayuawitsie, raye'at+ meta wichiti anet+; mexuawekai akeritsix+ atahutame plagas me'aha+ritat+, ke'ane meh+k+t+kai kwinat+rieka plagas wak+manak+ Kaka+yari hax+aya paye 'axe. ->>>>>>> 18226b7b668154b9495fe08a7624f5b8872402cd +\c 15 \v 1 M+ta tawari tixa+ netiuxei taheima, kunie ti aneme: muwa mekanierekai atahuta akeritsix+ atahuta me aha+ritat+ tsitiyuruwame, m+k+ hik+t+kai tsitiyuruwame kuinat+me m+k+k+ paya anikiekai Kaka+yari hax+aya. \ No newline at end of file diff --git a/15/02.txt b/15/02.txt index 88df081..1d7a521 100644 --- a/15/02.txt +++ b/15/02.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 2 Nepuxei tiuyuxexeiyame haramara mer+ka+yet+ n+it+ariekame tai mat+a. Meputi ukai haramara testa iya aku meteyu iwakate heima tewaxi meta siere +kiyaya'k+ metasiere kepa+mamek+ mema uxekai me ixatat+ kentitewa. M+k+ mepa +kai kanari warumikai Kaka+yari. -======= -\v 2 Nepuxei haramara mer+ka+yeme tain+t+ . meputiu'kai haramara testa iyamexi ke'ane mete'aiwakai tewa yautanakatsie meta wewiyari meta. M+k+mexi mepa'+kai tiyuit+wame Kaka+yari wayetuiriekai. ->>>>>>> 18226b7b668154b9495fe08a7624f5b8872402cd +\v 2 Nepuxei tiuyuxexeiyame haramara mer+ka+yet+ n+it+ariekame tai mat+a. Meputi ukai haramara testa iya aku meteyu iwakate heima tewaxi meta siere +kiyaya'k+ metasiere kepa+mamek+ mema uxekai me ixatat+ kentitewa. M+k+ mepa +kai kanari warumikai Kaka+yari. \ No newline at end of file diff --git a/15/03.txt b/15/03.txt index 31566b7..bcbbb46 100644 --- a/15/03.txt +++ b/15/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 M+k+ mekwikakai kwikarieya Moises, m+k+ uximayatame Kaka+yari, meta siere kwikarieya Muxa: ''kunie ti anene waikawemek+ kepentiuyuri, Ukiyari Kaka+yari Kunie tit+r+ka+ye, aku tinaimetsie tin+'a. Aix+ ane yuri h+k+ a'huye, Rey naimetsie kwiepa. \v 4 Ke ane aku kwuametsi hautexie, Ukiyari, meta siere kunie pera ya ar+kame metsi ayeit+a kepentitewa'k+? Ak+tsi xeik+a peneh+k+ Santo. Na+ti kiekari anyayau manmanet+ka me ax+ani m+ta mematsi ayexeiya aix+ petikat+ak+ meyutima.'' -======= -\v 3 M+k+mexi mepakwit+katei Moisés, kwikarieya Kaka+yari ti'uximayatsiriwame, meta Muxa kwikarieya '' raye'akamek+ meta aix+'anek+ a'uximayatsika h+k+, Ukiyari Kaka+yari naimek+ pet+r+ka+ye, its+kame peh+k+ naimek+. aix+'ane meta yuri h+k+'ahuye, nuiwariwa' wa Rey. \v 4 ¿Ke'ane kwatimani, Ukiyari, peyetuiriyerieni kepentitewak+? ek+xeik+a 'aix+ pe'ane peh+k+. yunait+ nuiwari mepak+ne ah+xie meta metitunumauni metehetimanik+ kename ek+ aix+ petiuka iyari peh+k+.'' ->>>>>>> 18226b7b668154b9495fe08a7624f5b8872402cd +\v 3 M+k+ mekwikakai kwikarieya Moises, m+k+ uximayatame Kaka+yari, meta siere kwikarieya Muxa: ''kunie ti anene waikawemek+ kepentiuyuri, Ukiyari Kaka+yari Kunie tit+r+ka+ye, aku tinaimetsie tin+'a. Aix+ ane yuri h+k+ a'huye, Rey naimetsie kwiepa. \v 4 Ke ane aku kwuametsi hautexie, Ukiyari, meta siere kunie pera ya ar+kame metsi ayeit+a kepentitewa'k+? Ak+tsi xeik+a peneh+k+ Santo. Na+ti kiekari anyayau manmanet+ka me ax+ani m+ta mematsi ayexeiya aix+ petikat+ak+ meyutima.'' \ No newline at end of file diff --git a/15/05.txt b/15/05.txt index 184d7c3..585edf5 100644 --- a/15/05.txt +++ b/15/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Umanierita nepunierix+ muwa kunie raku santo 'yatsie, kewa waki muwekai ne'nieremete, pauyepiet+katei ta heima. \v 6 Mapayenex+a muwa aku kunie raku Santo'yatsie, ata huta akeritsix+ me a'ha+ritakame atahuta tsitiyuruwame'te. Mepauket+katei ixuriki'k+ wichi'aneneme sawawat+me meta siere h+ayame utimerikamek+ mepayuh+at+katei. -======= -\v 5 M+ta yenetiuniereka nepuxei kewa wa+kawa aix+ tuiye'anetsie, taheima manakayuawitsie reuyepiekai. \v 6 Aix+tiuye'anetsie mehayenex+aka mepanuax+a atahuta akeritsixi atahutame plagas me'aha+ritat+. mepaukemarit+katei ixurikik+ wichinemek+ mer+kawime mete'akapit+ meta mepanayuh+at+katei yutawitsie oro h+ayameyarik+. ->>>>>>> 18226b7b668154b9495fe08a7624f5b8872402cd +\v 5 M+ta yenetiuniereka nepuxei kewa wa+kawa aix+ tuiye'anetsie, taheima manakayuawitsie reuyepiekai. \v 6 Aix+tiuye'anetsie mehayenex+aka mepanuax+a atahuta akeritsixi atahutame plagas me'aha+ritat+. mepaukemarit+katei ixurikik+ wichinemek+ mer+kawime mete'akapit+ meta mepanayuh+at+katei yutawitsie oro h+ayameyarik+. \ No newline at end of file diff --git a/15/07.txt b/15/07.txt index 25cdb25..4805784 100644 --- a/15/07.txt +++ b/15/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Xewit+ tewatsix+ memu uwa wayatuiri ata huta akeritsix+ atahutame xak+r+te oro'mat+kaime h+p+neme hax+ayak+ Kaka+yari, iya aku ke ane mayaniere tukarik+ metasiere tukari'k+ mautiyune. \v 8 Wichilaku santo'yatsie paku h+nekai k+tsiyariyari'k+ kunie raya axe Kaka+yari meta siere t+r+kariya'yak+. Nixewit+ mauta hani kwa y+wekai muwa x+kate iya atahuta tsiti'ane meta sietre atahuta akeritsix+ mekate aya at+anike -======= -\v 7 Xewit+ tewatsix+ memu'uwa wayetuiri atahuta akeritsix+ atahutame Oro tek+xiyari Kaka+yari hax+aya h+p+neme, kah+k+t+ni tukarik+ muyeka meta muyeikani tukari mautihane, \v 8 Aix+ tiuye'anetsie k+tsi puyeh+nekai raye'akamek+ Kaka+yari kentit+r+ka+yek+ . xewit+ mautayani kway+wekai astakepauku atahuta plagas atahuta akeritsixi maye'anikekaitsie. ->>>>>>> 18226b7b668154b9495fe08a7624f5b8872402cd +\v 7 Xewit+ tewatsix+ memu'uwa wayetuiri atahuta akeritsix+ atahutame Oro tek+xiyari Kaka+yari hax+aya h+p+neme, kah+k+t+ni tukarik+ muyeka meta muyeikani tukari mautihane, \v 8 Aix+ tiuye'anetsie k+tsi puyeh+nekai raye'akamek+ Kaka+yari kentit+r+ka+yek+ . xewit+ mautayani kway+wekai astakepauku atahuta plagas atahuta akeritsixi maye'anikekaitsie. \ No newline at end of file diff --git a/15/title.txt b/15/title.txt new file mode 100644 index 0000000..f0e1337 --- /dev/null +++ b/15/title.txt @@ -0,0 +1 @@ +capítulo 15 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 0402031..a286486 100644 --- a/manifest.json +++ b/manifest.json @@ -160,6 +160,7 @@ "14-14", "14-17", "14-19", + "15-title", "15-01", "15-02", "15-03",