wendyc
/
tac_luk_text_reg
1
0
Fork 0
Files Issues Pull Requests Releases Wiki Activity See in Reader

Mon Aug 15 2022 09:42:06 GMT-0600 (Mexican Pacific Daylight Time)

This commit is contained in:
wendyc 2022-08-15 09:42:06 -06:00
parent a96697c69b
commit 8d466feddb
5 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
16/08.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 8 \v 9 nije mi ane, we kanilsi jare yuwa namuti wenomi nijika, jiti no´pali ma suwasa, we kanila mi narema mi ripa mapo´ona we simati niru kari.
=======
\v 8 Na ne kaniliga ripili echi bacha wilime echi nachutame yua chati olame jopi cili echi ne ke nachiliga niraga olaga, jopi riga echi japi bami kuchi we nali ju ne ke nachili nira'a, ologa chopiriga nira'a jopiriga echi kuchi ne machime nira'a. \v 9 Na nije je ani, me echi mujue apanerola ne we niwame yua ketasi a labe olame nira'a, jopi ali nira'a mujue nowalesa, ne ripa naretame nira nima remo.
>>>>>>> 3be323c3770073485147bbf80161a76cd9c581ab
\v 8 \v 9 Conflict Parsing Error

6
16/10.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 10 echi nop we ala tibu kua namuti, ayenacho we ara tibu wika namuti nisa \v 11 ari emi kie ara tibusa jare mi winoimi iyasa ¿chikia mi iyamarie wanomi? \v 12 ari yemi kie machisa tibuwa winomi jare niwala ¿chikia mi iyamirie winomi?
=======
\v 10 Jopi we ala ju pi kua nira, jopali wabe niwa ne ala ju chio, na jopi pi kua niwa ne we chariga ju, jopali we niwe ne wabe chariga chio ju. \v 11 Li jopali we niwilimo we chariga ni limo ne ke kalabe olalimo ala, ¿Chika bichima ne ala bichiuli nira'a? \v 12 Li na ke kala nisamo mujue nira'a, ¿Chika nijima jopi tamuje niwala ju?
>>>>>>> 3be323c3770073485147bbf80161a76cd9c581ab
\v 10 \v 11 \v 12 Conflict Parsing Error

6
16/13.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 13 kie bire wesi nocham omerma okua nuluam yua nocha, jiti bire bichimare ri bireko we karema, we bilepi yuwa kala nochuamare ali chue bile yuwa kichimare. iyem ko kie omerma Riosi bichiwa ali nia winomi si we natimasa".
=======
\v 13 Ke tasi bile rijowi okua niraga bichiuga simire, chiriga bile kichiga simire li chubile ne kalega simire, we kalega na chubile ne ke tasi kalega simire. Ke tasi ompabire Riosi bichiwa na echi wika namuti niuga."
>>>>>>> 3be323c3770073485147bbf80161a76cd9c581ab
\v 13 Conflict Parsing Error

6
16/14.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 14 jipiko echi Bariseo, nop we natimam nili winomi, ara kipuri jena raichali, ali aboni we kaweeli Jesusi. \v 15 ali Binoi ko jeaneli echi aboni: yemko we ala nira yiena auche jare riwirk, chopi Riosi ko machi yem surara. echi namuti mapu we nateem nira echi pakotami Riosi yuwa ko ketasi nateami ju.
=======
\v 14 Na kipu je na karga namuti echi bariseo, ne we niwame nira'a ne binelí na ne cah aniga nakuali echi nira'a. \v 15 Li je aneli: "Tamuje ju jopi ne bachame wilarga ane bachami ta muje aboni nira'a tamuje ralamulí, we na li bionoi Riosi machi tamuje sulala, jopi niwe echi ralamili niwe baowame nira, bachami nira Riosi nira ju ketasi nowalekuame.
>>>>>>> 3be323c3770073485147bbf80161a76cd9c581ab
\v 14 \v 15 Conflict Parsing Error

5
manifest.json
View File

@ -294,11 +294,8 @@
"16-01",
"16-03",
"16-05",
"16-08",
"16-10",
"16-13",
"16-14",
"16-16",
"16-18",
"16-19",
"16-22",
"16-24",