paco_camacho
/
tzh-x-oxchuctzeltal_act_text_reg
1
0
Fork 0
Files Issues Pull Requests Releases Wiki Activity See in Reader

Tue Apr 13 2021 17:14:39 GMT-0400 (Eastern Daylight Time)

This commit is contained in:
Michael A. Rodriguez 2021-04-13 17:14:39 -04:00
parent 7f39bd8a68
commit 411853a078
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
07/38.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 38 \v 40 ja nix te moises te ay ta tsoble ta bay jochol takin k'inal sok te ch'ul abat te k'oponot yu'un ta bay wits sinai .soku-uk te chich mamiletik,sok te la yich' te k'opetik yu'un te kuxinel te la yak' botike \v 39 Ja'uk me to te chich-mamtik nameye ma la sk'an yich'beyik ta muk' te smantal te moisese sok la sk'e sbaik lok'el ta stojol sok la sk'an yot'anik te ya sujt'ikbael ta lam ejiptoe
=======
\v 38 \v 39 \v 40 Sa la yalbeyik te Aorone: PASBOTIK KAJKANANTIK SWENTA YU'UN YA XME-ELAJ TA BE-EL KU-UN TIKA,JA MA NATIK TE BILA LA SPAS TE MOISESS TE JA LA SLOK'ESOTIK TEL TA SLUMAL EGIPTO.
>>>>>>> 12067a4fad40fd5604f561c0107ad22642b267de
\v 38 \v 39 \v 40 Sa la yalbeyik te Aorone: PASBOTIK KAJKANANTIK SWENTA YU'UN YA XME-ELAJ TA BE-EL KU-UN TIKA,JA MA NATIK TE BILA LA SPAS TE MOISESS TE JA LA SLOK'ESOTIK TEL TA SLUMAL EGIPTO.

3
manifest.json
View File

@ -39,7 +39,8 @@
"RAMON D ALVARADO BURGOS",
"Vanesa de los Angeles Martínez Hernández",
"damaso jose reyna rondon",
"leidy"
"leidy",
"Michael A. Rodriguez"
],
"finished_chunks": [
"07-17",