Wed Sep 15 2021 11:30:10 GMT-0400 (Eastern Daylight Time)

This commit is contained in:
Michael A. Rodriguez 2021-09-15 11:30:10 -04:00
parent e317c837fc
commit c73b9ed662
3 changed files with 4 additions and 10 deletions

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 2 hua uma tiyat huantu tamaxtakga; putum anta ni tapesikgoy filisteos putum huanti xala gesuritas, \v 3 sukuy sihor, xtampajan Egipto , chu paxtu xkilhpan Ecrón , huan tu mapeksikgoy cananeos; kgalhaquisis mapekgsinanin xala Filistea; xala Gaza, Asdod, Ascalón , Get chu Ecrón , xpulhatamamkan aveos.
=======
\v 2 \v 3 2 wa uma tiyat huantu tamaxtakga; putum anta ni tapesikgoy filisteos putum huanti xala gesuritas, 3 sukuy sihor, xtampajan Egipto , chu paxtu xkilhpan Ecrón , huan tu mapeksikgoy cananeos; kgalhaquisis mapekgsinanin xala Filistea; xala Gaza, Asdod, Ascalón , Get chu Ecrón , xpulhatamamkan aveos.
>>>>>>> 8e4e6f7d5b4457fd97bc0479d17e51aea182683c
\v 2 wa uma tiyat huantu tamaxtakga; putum anta ni tapesikgoy filisteos putum huanti xala gesuritas, \v 3 sukuy sihor, xtampajan Egipto , chu paxtu xkilhpan Ecrón , huan tu mapeksikgoy cananeos; kgalhaquisis mapekgsinanin xala Filistea; xala Gaza, Asdod, Ascalón , Get chu Ecrón , xpulhatamamkan aveos.

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 4 pakalhu , huilakgohlku lhuhua xtiyatkan cananeos, chu Mehara huantu tapekgsi sidonios, takilhpastuka Afec, xkilpan xkachikinkan amorreos; \v 5 xtiyatkan giblitas , putum Líbano astanta pekan tani pulha chichiní , chu Baal Gad xpakgalhu xakakiwin Hermón chu Lebo Hamat.
=======
\v 4 \v 5 pakgalhu , huilakgohlku lhuwa xtiyatkan cananeos, chu Mehara huantu tapekgsi sidonios, takilhpastuka Afec, xkilpan xkachikinkan amorreos; 5 xtiyatkan giblitas , putum Líbano astanta pekan tani pulha chichiní , chu Baal Gad xpakgalhu xakakiwin Hermón chu Lebo Hamat.
>>>>>>> 8e4e6f7d5b4457fd97bc0479d17e51aea182683c
\v 4 pakgalhu , huilakgohlku lhuwa xtiyatkan cananeos, chu Mehara huantu tapekgsi sidonios, takilhpastuka Afec, xkilpan xkachikinkan amorreos; \v 5 xtiyatkan giblitas , putum Líbano astanta pekan tani pulha chichiní , chu Baal Gad xpakgalhu xakakiwin Hermón chu Lebo Hamat.

View File

@ -152,6 +152,8 @@
"12-21",
"13-title",
"13-01",
"13-02",
"13-04",
"13-06",
"13-08",
"13-10",