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

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

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

6
18/01.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\c 18 \v 1 Echali jonsa Binoi binierka namuti rukua echi auche jare aneli mapu chorika Ra´ichama Riosi Yuwa sinibi rawe, ali kie sine siweka, \v 2 jeanika: "bitieli a Bilen wika rijoachi, bile bacha chukumi raichali akarewam mapu j¡kie majam nili Riosi ali kie Ala kuwirami echi auche jare pakotami"
=======
\c 18 \v 1 Ali binoi nijali jare raichala echi chulubi tanma na ketasi ku kuwana ku wichiwame. \v 2 Aniga: "niruli bile loichiwali siudachi ali bile bichiwali bacha chikume nopi ketasi majali Riosi ali ketasi nijewiga nokulí aboni ralamili kaa.
>>>>>>> 3be323c3770073485147bbf80161a76cd9c581ab
\c 18 \v 1 \v 2 Conflict Parsing Error

2
manifest.json
View File

@ -304,6 +304,7 @@
"16-29",
"17-title",
"17-01",
"17-03",
"17-05",
"17-07",
"17-09",
@ -319,7 +320,6 @@
"17-34",
"17-37",
"18-title",
"18-01",
"18-03",
"18-06",
"18-09",