From b1f5c79f83a08b2f6c9e50df411ed31163f786af Mon Sep 17 00:00:00 2001 From: michael_rodriguez Date: Thu, 22 Apr 2021 14:05:15 -0400 Subject: [PATCH] Thu Apr 22 2021 14:05:15 GMT-0400 (Eastern Daylight Time) --- 15/01.txt | 6 +----- 15/03.txt | 7 +------ 15/05.txt | 7 +------ 15/07.txt | 6 +----- 22/01.txt | 6 +----- manifest.json | 3 +++ 6 files changed, 8 insertions(+), 27 deletions(-) diff --git a/15/01.txt b/15/01.txt index c52c2e8b..65dc42bb 100644 --- a/15/01.txt +++ b/15/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 -======= -\v 1 sok lajkil yan vuelta señail ta ch'ulchan, te muk'nax sok bayal yutsilal: Ay juk tul ch'ul abatetik, te jaixa te slajibal woklajele yu'un jich ya xk'ot ta pasel te yilamba te Dios. ->>>>>>> 75f976f47aa90357a5ae68bb0a4fe5630492c6d7 +\c 15 \v 1 sok lajkil yan vuelta señail ta ch'ulchan, te muk'nax sok bayal yutsilal: Ay juk tul ch'ul abatetik, te jaixa te slajibal woklajele yu'un jich ya xk'ot ta pasel te yilamba te Dios. \ No newline at end of file diff --git a/15/03.txt b/15/03.txt index 045a1b87..9573ad4e 100644 --- a/15/03.txt +++ b/15/03.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 4 \v 3 -======= -\v 3 Sok yakalik ta sk'ajintayel te sk'ayoj te Moises, te ja abat yu'un te Dios, sok te sk'ayoj te alal chij:" Te smuk'ul sok yutsilal te awatel, kajwatik Dios te muk' awvele, te ja ajwalilat ta spamal balumilale. Te ja tojat sok te ja smeleeil te ja be, muk'ul ajwalil yu'un te muk'ul pam lumetike. -\v 4 ¿Kajwal, ay ba mach'a te ma xiate sok te ma yich' ta muk' te abiile? te jaatnax tojat atukele. Spisil te muk'ul pam lumetike ya xtalik ta atojol ya yichatik ta muk' yu'un spisil te beluk lek la pase la yich'ix ak'el nael stoj.'' ->>>>>>> 75f976f47aa90357a5ae68bb0a4fe5630492c6d7 +\v 3 Sok yakalik ta sk'ajintayel te sk'ayoj te Moises, te ja abat yu'un te Dios, sok te sk'ayoj te alal chij:" Te smuk'ul sok yutsilal te awatel, kajwatik Dios te muk' awvele, te ja ajwalilat ta spamal balumilale. Te ja tojat sok te ja smeleeil te ja be, muk'ul ajwalil yu'un te muk'ul pam lumetike. \v 4 ¿Kajwal, ay ba mach'a te ma xiate sok te ma yich' ta muk' te abiile? te jaatnax tojat atukele. Spisil te muk'ul pam lumetike ya xtalik ta atojol ya yichatik ta muk' yu'un spisil te beluk lek la pase la yich'ix ak'el nael stoj.'' \ No newline at end of file diff --git a/15/05.txt b/15/05.txt index 5e965c88..5db189a6 100644 --- a/15/05.txt +++ b/15/05.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 6 \v 5 -======= -\v 5 Ta patilal la jkil te awilal te k'axemtoxan ch'ultesbit, te le aya te nail pak' yu'un te testigoetik, sok te jambilixa te ch'ulchane. -\v 6 Lok'iktel ta banti awilal te k'axemtoxan ch'ultesbil te juk tul chul abatetik te ja yik'ojiktel te juk chajp' woklajel. slapojik lino pak' te xuj ma ba ts'ilajem sok xlememetnax ta ilel sok ay xchujk'il xch'ujtik te k'an lemantik (dorado) te chuk'ul ta sjuyubal te stanike. ->>>>>>> 75f976f47aa90357a5ae68bb0a4fe5630492c6d7 +\v 5 Ta patilal la jkil te awilal te k'axemtoxan ch'ultesbit, te le aya te nail pak' yu'un te testigoetik, sok te jambilixa te ch'ulchane. \v 6 Lok'iktel ta banti awilal te k'axemtoxan ch'ultesbil te juk tul chul abatetik te ja yik'ojiktel te juk chajp' woklajel. slapojik lino pak' te xuj ma ba ts'ilajem sok xlememetnax ta ilel sok ay xchujk'il xch'ujtik te k'an lemantik (dorado) te chuk'ul ta sjuyubal te stanike. \ No newline at end of file diff --git a/15/07.txt b/15/07.txt index 1cf7dbb9..a392cfb0 100644 --- a/15/07.txt +++ b/15/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 \v 7 -======= -\v 7 Ay kojt ta xhan kojt'ol te kuxul chambalame la yak'beyik te jut tul chul abatetike juk wax awil te pas il ta k'alal tak'in (oro) te nojetik ta yilimba te Dios, te stalel kuxul sbajt'el k'inal.\v 8 Te awilal te k'axemtoxan ch'ultesbil noj ta chail yu'un yutsilal te Dios sok te yuele. Mayuk mach'a ya stak' ochbael lea ja to te k'alal k'axbael te juk chajp'' te wokolil te yichojiktel te juk tul ch'ul abatetike. ->>>>>>> 75f976f47aa90357a5ae68bb0a4fe5630492c6d7 +\v 7 Ay kojt ta xhan kojt'ol te kuxul chambalame la yak'beyik te jut tul chul abatetike juk wax awil te pas il ta k'alal tak'in (oro) te nojetik ta yilimba te Dios, te stalel kuxul sbajt'el k'inal. \v 8 Te awilal te k'axemtoxan ch'ultesbil noj ta chail yu'un yutsilal te Dios sok te yuele. Mayuk mach'a ya stak' ochbael lea ja to te k'alal k'axbael te juk chajp'' te wokolil te yichojiktel te juk tul ch'ul abatetike. \ No newline at end of file diff --git a/22/01.txt b/22/01.txt index 0d582297..bd190e01 100644 --- a/22/01.txt +++ b/22/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 22 \v 1 \v 2 -======= -\v 1 Jich yu'un te ch'ul abat la yak'bon kil muk'ul ja' jich bit'il te cristal te xlemet nax sok sak nax te ja ya yak' kuxinele. Le' yak ta lok'el tel ta bay muk'ul naktijibal yu'un Dios sok te alal chije.\v 2 sok okin beel ta yolil te calle yu'un te muk' lume. Ta jujumejch' sti'il te ja'e le aya te te' te ja ya yak' lajchayeb (12) sit yu'un te kuxinele melel ya yak' sit jujun u. Te ya'benal te te'e ja xpoxil te muk'ul lumetike. ->>>>>>> b7b0f52348966fdd1e6942615cb373017664b583 +\c 22 \v 1 Jich yu'un te ch'ul abat la yak'bon kil muk'ul ja' jich bit'il te cristal te xlemet nax sok sak nax te ja ya yak' kuxinele. Le' yak ta lok'el tel ta bay muk'ul naktijibal yu'un Dios sok te alal chije. \v 2 sok okin beel ta yolil te calle yu'un te muk' lume. Ta jujumejch' sti'il te ja'e le aya te te' te ja ya yak' lajchayeb (12) sit yu'un te kuxinele melel ya yak' sit jujun u. Te ya'benal te te'e ja xpoxil te muk'ul lumetike. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7960efde..10736252 100644 --- a/manifest.json +++ b/manifest.json @@ -153,7 +153,10 @@ "14-17", "14-19", "15-title", + "15-01", "15-02", + "15-03", + "15-05", "15-07", "16-title", "16-01",