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

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

This commit is contained in:
wendyc 2022-08-15 09:38:06 -06:00
parent cfbd4876e4
commit 14f506cb20
7 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
14/01.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\c 14 \v 1 jerika ikili sinie rawe sawalach, echona bkisia kowasia echi pani echona fariseos ali echi siliame bitelch nili, aboni we nienli. \v 2 je naiba, sali bacham bile rijoi mapu we risu nili wali buwakm nili. \v 3 echona jonsa Jesusi ra´ichl echi kala machika iniem echi usuli echi jurios nil ali echi mina bariseos: "¿a risiens ju mapurika sawalach sawabo echi nayukami, wecho kie?"
=======
\c 14 \v 1 Siné rawe sawalchi, echí simili bileana bitichí echoná waluala bariseo aniliwame bineríame bitelachi, ali echi auche jaré bariseo echona ne wabe kanilika asáli. \v 2 Echali, bite rojoi wabe risuati wabe bajakame nili. \v 3 Echi Jesusi rakuga ané echi jare nura'ami li bariseo:"¿Ne bichiwali nirá a ka sawé echali sawalachi, li kié?
>>>>>>> 3be323c3770073485147bbf80161a76cd9c581ab
\c 14 \v 1 \v 2 \v 3 Conflict Parsing Error

6
14/04.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 4 chopi echi kie anika muchuli. Echijiti Jesusi chapili echi rijoi, ku sawali ali ku siminla nuleli. \v 5 Binoi jeaneli echi aboni: "¿Chikia yem a kuchi i bukue bilie was mapu bilien rilien jotach chisia isiabkuach rawe, ali kie ku machibu we sapuk?" \v 6 kie omerli ku nijiewaka ané jena jiti .
=======
\v 4 Li echiriki kili nira'a. Echi Jesusi werika, ku sawá li ku ma júuli. \v 5 Li echirika binoí ane "¿Chika emi rane bile ta'a towi o bile masi mapu wichili rale jochí echalí rawe isabuachi, ne sapuka ke machi pa'a?" \v 6 Echika ketasi niíli mapu nijima bile bichiwali jena namuti.
>>>>>>> 3be323c3770073485147bbf80161a76cd9c581ab
\v 4 \v 5 \v 6 Conflict Parsing Error

6
14/07.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 7 mapuali riwisa chorika echi jare mapu bayerami nili ne bacha muchubli, Binoi namuti rukua binierli, Jeaneka. \v 8 "Mapuali yem bayeram nísa niwikuam omowaluach kowasia, kie muchubsi ni we bacham mapona we natem muchumare, mapujiti jarecho mapu waminap natem yem yuk, bayertam ikirie. \v 9 Mapuali echi mapu nipiarli, Binoi jeanime: ´risiens iya mapu rika auche bile echona asimie´ ali jonsa we riwelk yem auche bilien simiama mapona kie me niriaram muchumare.
=======
\v 7 Echari mapu ali Jesusi ma riwali mapurika echí auche jare mapu echona bayerame niíri chopí echona garabeara asinali, echali binoi Jerika ane. \v 8 Mapu ali emi bayerami niísa echona bileana niwikuachi, ketasi bacha asibá echona garaberachí, mapa jíti sine ka'achí auche bile rijoi wamirabí wabe walúbeala ke tasi mapuka muje ayenacho bayerame nima. \v 9 Echali ralamali mapa bayeli a okuaka nolinama ali biche mi jeanema: 'Je na ya mápá binoi echona asimea echali' muje wabe riwelika simeo echo wabe jubami nira'a.
>>>>>>> 3be323c3770073485147bbf80161a76cd9c581ab
\v 7 \v 8 \v 9 Conflict Parsing Error

6
14/10.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 10 Chopi mapuali yem bayeram isa, simibk ali muchubs echona mapona kie niriaram muchumare, mapurika ech nop bayek nawama, ich mi omerma jeane: ""Apanero, simibka muchubsi minian kala su´we rikiach, yem ala nateami niriaram nima kara suwaba jiti mapu iki muchubali yemi yuka echona miesch. \v 11 mapujiti kara suwaba mapu iki we niriam ju aboni ku kie nateami niriaram nimare, ali mapu kie mie niria binoi we simira onorami nimare".
=======
\v 10 Chopi mapu ali mi bayeramie ju, echona simika ne jabami, asabá, mapariko mapa ali nolinsa mapa ni mi bayeli, echiko mi Jerika anema, keni amigoala, akina ne bacha'ami simiga, asaga. 'Echali echo auche jare echona napawika machawami gala riwemea mapa muje echirika ne waluala nima. \v 11 Mapajiti mapayirpi a binoi waru beraka, echico wabe tabeala nima, ali biche echi mapu binoi wabe tabeala, echiko ariko wara'ara nima".
>>>>>>> 3be323c3770073485147bbf80161a76cd9c581ab
\v 10 \v 11 Conflict Parsing Error

6
14/12.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 12 Jesusi ayencho mina jeaneli echi rijoi mapubayerli Echi: "Mapuali muje nijia kowám,, kie bayeri muje apaneruala wecho mujue rijimial wecho muje yuwa najiremam wecho mulup ipiriem muje yuwa echi we onumuam, mapujiti echi miniam ku nipira ayena omerma re, ali muje bayertam nima mapurika nateta niria"
=======
\v 12 Jesúsi ayenacho jeaneli echi rijoi mapu binoi bayeli binoi: "Mapu ali maje a bile koáme ke tasi baye maje amiga'ala ni bile maje rijímala o muje tema'ala a mapu muje yaa bite wabe niwame, mapurika echiko chikoriks ka nimi bayema, li maje ku chikorika narema ka natetika ku kawana.
>>>>>>> 3be323c3770073485147bbf80161a76cd9c581ab
\v 12 Conflict Parsing Error

6
14/13.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 13 \v 14 chopi mapuali muje ko´wami konsa, bayeri echi we risuati, echi kie omerami simiya,
=======
\v 13 Mapurika maje echirika ala komea, baye echi rusuati, li echi ke tasi omeram iyena li ketasi machilami, \v 14 li echirika muje wabe ku kuwirtami ni'ima mapurika aboi ketasi amerarma ku nateta kuwana. Mapa muje echirika ku arami ni'ima li echirika ku owinali echi ne bichiwali nira'a".
>>>>>>> 3be323c3770073485147bbf80161a76cd9c581ab
\v 13 \v 14 Conflict Parsing Error

8
manifest.json
View File

@ -249,6 +249,8 @@
"12-35",
"12-37",
"12-39",
"12-41",
"12-45",
"13-title",
"13-01",
"13-04",
@ -266,12 +268,6 @@
"13-31",
"13-34",
"14-title",
"14-01",
"14-04",
"14-07",
"14-10",
"14-12",
"14-13",
"14-15",
"14-18",
"14-21",