Wed Apr 11 2018 11:28:56 GMT-0400 (SA Western Standard Time)
This commit is contained in:
parent
56d4a7a788
commit
ce0bf1fa7a
|
@ -1,5 +1 @@
|
|||
<<<<<<< HEAD
|
||||
\v 12 \v 13 \v 14 Ya 'umiemek+ ne'tsiere netiniuka kwikwineni m+k+'tsie ne nekwa hauyutewiya; hetsiena ne tiuta'eri, nemimatek+ m+k+. Nerakumate ke m+k+ miti utawe tita m+k+ neti h+rit+a, ke pa+k+ nemanuanitsie. Yake ti hek+aka a hetsie +kit+árika ne hetsie kepetiu'ene, Cristo Jesús'tsie lasunik+ petieriet+ pa+na peheinake'eriet+. Neuti uta Santo Espíritu'tsie m+k+ ta hetsie muye yeika, tita aix+ ti'aneme Kaka+yari atiu h+rit+a.
|
||||
=======
|
||||
Ya 'umiemek+ ne'tsiere netiniuka
|
||||
>>>>>>> branch 'master' of git@git.door43.org:mitikiwostky/hch-x-huicholeste_2ti_text_reg.git
|
||||
\v 12 \v 13 \v 14 Conflict Parsing Error
|
|
@ -1 +1 @@
|
|||
\v 15 \v 16 \v 17 \v 18 Ek+ri peramate nait+ Asia memukutei nienetsiku'eiri. Figelo, Hermógenes mewa n+t+ pa+na. Ta'Ukiyari ke 'utinenimayata Onesíforo kie, m+k+ netsi'uye wa+rit+at+yeikakai pa+na m+k+ kwa'uyu titewiyax+ nemanuta h+iyakaik+ Ke pa+ka m+k+ Roma munua, netsi waunet+ naitsarie kanenuka xeiya. Ta'Ukiyari ke'enu pit+irieni nenimayatsikaya muka xeiyak+ ana tukari maye anitsie. Ek+ perakumate ke ne tiu parewi Éfeso nemukateitsie.
|
||||
\v 15 Ek+ri peramate nait+ Asia memukutei nienetsiku'eiri. Figelo, Hermógenes mewa n+t+ pa+na. \v 16 Ta'Ukiyari ke 'utinenimayata Onesíforo kie, m+k+ netsi'uye wa+rit+at+yeikakai pa+na m+k+ kwa'uyu titewiyax+ nemanuta h+iyakaik+ \v 17 Kepauka m+k+ Roma munua, netsi waunet+ naitsarie kanenuka xeiya. \v 18 Ta'Ukiyari ke'enu pit+irieni nenimayatsikaya muka xeiyak+ ana tukari maye anitsie. Ek+ perakumate ke ne tiu parewi Éfeso nemukateitsie.
|
|
@ -46,6 +46,7 @@
|
|||
"01-03",
|
||||
"01-06",
|
||||
"01-08",
|
||||
"01-15",
|
||||
"02-title",
|
||||
"02-01",
|
||||
"02-03",
|
||||
|
|
Loading…
Reference in New Issue