diff --git a/15/01.txt b/15/01.txt index 6d89f71d..c52c2e8b 100644 --- a/15/01.txt +++ b/15/01.txt @@ -1 +1,5 @@ -\v 1 \ No newline at end of file +<<<<<<< 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 diff --git a/15/02.txt b/15/02.txt new file mode 100644 index 00000000..5125a294 --- /dev/null +++ b/15/02.txt @@ -0,0 +1 @@ +\v 2 La jkil te jich' yilel te bit'il muk'ul ja te xlememetnax jich te bit'il espejo te kapb'il sok k'ajk'e. ta sti muk'ul ja' le tek'atika te mach'atik ju yu'unik stalel te muk'ul chambalam te xibantik sbae te sbiile ja jun ajtalul. stsakojik yapaik te ja ak'bilik yu'un te Dios. \ No newline at end of file diff --git a/15/03.txt b/15/03.txt index 2d806681..045a1b87 100644 --- a/15/03.txt +++ b/15/03.txt @@ -1 +1,6 @@ -\v 4 \v 3 \ No newline at end of file +<<<<<<< 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 diff --git a/15/05.txt b/15/05.txt index 6a615b36..5e965c88 100644 --- a/15/05.txt +++ b/15/05.txt @@ -1 +1,6 @@ -\v 6 \v 5 \ No newline at end of file +<<<<<<< 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 diff --git a/15/07.txt b/15/07.txt index 76584134..1cf7dbb9 100644 --- a/15/07.txt +++ b/15/07.txt @@ -1 +1,5 @@ -\v 8 \v 7 \ No newline at end of file +<<<<<<< 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 diff --git a/manifest.json b/manifest.json index e13889ac..73d190f3 100644 --- a/manifest.json +++ b/manifest.json @@ -202,6 +202,7 @@ "21-21", "21-23", "21-26", - "22-title" + "22-title", + "15-02" ] } \ No newline at end of file