From c73b9ed66233b360751304fbc2d5402a4076a6ca Mon Sep 17 00:00:00 2001 From: michael_rodriguez Date: Wed, 15 Sep 2021 11:30:10 -0400 Subject: [PATCH] Wed Sep 15 2021 11:30:10 GMT-0400 (Eastern Daylight Time) --- 13/02.txt | 6 +----- 13/04.txt | 6 +----- manifest.json | 2 ++ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/13/02.txt b/13/02.txt index 6c0c9080..dfc61b71 100644 --- a/13/02.txt +++ b/13/02.txt @@ -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. \ No newline at end of file diff --git a/13/04.txt b/13/04.txt index f33abd39..d221b4de 100644 --- a/13/04.txt +++ b/13/04.txt @@ -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. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 9adbed7b..15bd5209 100644 --- a/manifest.json +++ b/manifest.json @@ -152,6 +152,8 @@ "12-21", "13-title", "13-01", + "13-02", + "13-04", "13-06", "13-08", "13-10",