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

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

This commit is contained in:
wendyc 2022-08-15 09:46:06 -06:00
parent 2f4ff09ad2
commit 2707be6e0a
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
18/03.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 3 Jipko echona wika rijoachi biteli bile mapu ma kie kuneami nili ali binoi iyenli echomi echi rijoi bacha chukuami raichali alara jeanika: Tami ku´wiri kala ola mapu tami sayeri. \v 4 ili rawe echi kie sinie ku´wirali, chopi ma wilimle simirsa binoi jeanili: mapu kie maja nije Riosi, ali kie ala ola jare yuwa, \v 5 mapujiti jena muki kie kunuem tami mukumewami ju, ku´wirma ali ala achinaman raíchala, mapurika kie auche sina tami mukumenma sinibi rawe akina yenka
=======
\v 3 Jipeka echona siudachi niruli bile muki ke kuneme echiga chulubi simili napona walula ati jeaniga tami kuwiri.' \v 4 Pee wili rawe echiga ketasi kuuwiramaruli ali jona pe jubako echika anili pinoi niraá kuchi nije ketasi mayaine Riosi ali ketasi nije wine ralamulí, \v 5 chorikaria yena mukui kee kuneme tami we aye naauli kumiramane ali alamane inijia nopiria ma ke tami koloma chulubi."
>>>>>>> 3be323c3770073485147bbf80161a76cd9c581ab
\v 3 \v 4 \v 5 Conflict Parsing Error

6
18/11.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 11 \v 12 Nije ko kie kowa Onoruami jiti nataka osua chokuem bile tarali. sinibi niji echi wenomi makoy kayam rojoank mapu iki mien.
=======
\v 11 Echi Bariseo ilisli Onoruami yuwa ra'ichasia ali jeanili binoi jiti: "Riosi, mi natetali iya mapujiti kie chikorami ju nije nop yira auche jare ralamuli, mapu echi we siti olámi, kia yuwa yenami mukui o kiecho mapu yir je'mi wanomi nipiam. \v 12 "Nije ke koyene okua tarali nije a nijine onomi nopi iki meine.'
>>>>>>> 3be323c3770073485147bbf80161a76cd9c581ab
\v 11 \v 12 Conflict Parsing Error

6
18/13.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 13 nop echi wanomi nipaami, we mika wirika tasi inenli ripar riwigachi, chopi binoi ocho jeanika: Riosi pe riko tami natima, chati olaami ju nije. \v 14 nije yemi ane, jena rijoi ko ma ku wikawarami ku similli bitichi bachacho auche bile yuwa, mapujiti echi we nochami ju binoi pe kaweltami nima, chopi mapu we kili nata yeni ko we norami nima".
=======
\v 13 Nopiria echi nipame wili echona pe mika ketas wilasili binoy busila echona ripa riwigachi noparia ipisoli binoi sapala aniga Riosi ni wikawa tami nije we chati olame ju.' \v 14 Nije nimi cine tiemi jena rijoi simili binoy biteichi emia karaga chati ololila bachacho chujare yuga nopiría jare kanisa nima kichirame, jopi yirpe kichirame ju chorape calerame nima."
>>>>>>> 3be323c3770073485147bbf80161a76cd9c581ab
\v 13 \v 14 Conflict Parsing Error

5
manifest.json
View File

@ -320,11 +320,8 @@
"17-34",
"17-37",
"18-title",
"18-03",
"18-06",
"18-09",
"18-11",
"18-13",
"18-18",
"18-22",
"18-24",
@ -363,11 +360,13 @@
"20-03",
"20-05",
"20-07",
"20-09",
"20-11",
"20-13",
"20-15",
"20-17",
"20-19",
"20-21",
"20-23",
"20-25",
"20-27",