From 2eccc7a4a9a315deb93ff0cca90cba8be7ab8e6e Mon Sep 17 00:00:00 2001 From: michael_rodriguez Date: Wed, 15 Sep 2021 11:16:39 -0400 Subject: [PATCH] Wed Sep 15 2021 11:16:38 GMT-0400 (Eastern Daylight Time) --- 24/01.txt | 6 +----- 24/03.txt | 6 +----- 24/05.txt | 6 +----- manifest.json | 2 ++ 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/24/01.txt b/24/01.txt index bf4037cb..965d2c4a 100644 --- a/24/01.txt +++ b/24/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 24 \v 1 alistahl Josué kamamakxtumilh xputumkan xtalilakapsni xalak Israel nak Siquem chu katasanilh lak kgolun xala Israel, xmapeksinanin, chu akgastayawna, na chuna xlakgskunikan , wa lakgtalakasuwikgolh xlhakatin Dios. \v 2 Josué kawanilh xputumkan tachixcuwitat: ''wa uma tu puchina Dios xala Israel, wan : wa xpulana makgasa kilhtamaku latamakgolh thlak xa anucha anta ni hui xkgalhtuchokgo Eufrates, Taré , wa xtlati Abraham chu xtlati Nacor , wa xlakan laktakilhputakgolh tamakanitlaw. -======= -\c 24 \v 1 \v 2 , 1 Alistalh Josué kamamakxtumilh xliputumkan xtalilakgapasni xalak Israel nak Siquem chu katasanilh lakgolún xalak Israel, xmapekgsinanin, chu akgastayawaná, na chuna xlakgskunikan , paks talakatsuwikgolh xlhakatin Dios. 2 Josué kawanilh xputumkan tachixcuwitat: ''wa uma tu Puchina Dios xalak Israel, wan : wa xalakgmakgán latamani makgasa kilhtamaku latamakgolh tlakg pekganacha anta ni hui xkgalhtuchokgo Eufrates, Taré , wa xtlati Abraham chu xtlati Nacor , wa xlakan lakgatakilhputakgoy tamakanitlaw. ->>>>>>> 8e4e6f7d5b4457fd97bc0479d17e51aea182683c +\c 24 \v 1 , Alistalh Josué kamamakxtumilh xliputumkan xtalilakgapasni xalak Israel nak Siquem chu katasanilh lakgolún xalak Israel, xmapekgsinanin, chu akgastayawaná, na chuna xlakgskunikan , paks talakatsuwikgolh xlhakatin Dios. \v 2 Josué kawanilh xputumkan tachixcuwitat: ''wa uma tu Puchina Dios xalak Israel, wan : wa xalakgmakgán latamani makgasa kilhtamaku latamakgolh tlakg pekganacha anta ni hui xkgalhtuchokgo Eufrates, Taré , wa xtlati Abraham chu xtlati Nacor , wa xlakan lakgatakilhputakgoy tamakanitlaw. \ No newline at end of file diff --git a/24/03.txt b/24/03.txt index 2fdb9ccc..a90121d7 100644 --- a/24/03.txt +++ b/24/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 wampi akit kitiya mintlati antani xlamacha pekganacha Eufrates chu klehl xakatiyatna Canaán, maxkilh lhuwa xlikilhsukun xpakata xkgawasa Isaac. \v 4 wan chu Isaac kit maxkilh Jacob chu Esaú. wa Esaú kgmaxkilh nak xatiyat kakiwin xla Seir lakipi xlak nawan, wampi wa Jacob chu xkamanan ankgolh antani xwilacha Egipto. -======= -\v 3 \v 4 3 Wampi akit kitiya mintlati antani xlamacha pekganacha nak Eufrates chu kliyalh xakatiyathna Canaán, kmaxkilh lhuwa xkamanán xpalakata xkgawasa Isaac. 4 Wa chu Isaac kit kmaxkilh Jacob chu Esaú. Wa Esaú kmaxkilh tiyat kakiwin xla Seir laki pi xla nawán, wampi wa Jacob chu xkamanán ankgolh tani wilacha Egipto. ->>>>>>> 8e4e6f7d5b4457fd97bc0479d17e51aea182683c +\v 3 Wampi akit kitiya mintlati antani xlamacha pekganacha nak Eufrates chu kliyalh xakatiyathna Canaán, kmaxkilh lhuwa xkamanán xpalakata xkgawasa Isaac. \v 4 Wa chu Isaac kit kmaxkilh Jacob chu Esaú. Wa Esaú kmaxkilh tiyat kakiwin xla Seir laki pi xla nawán, wampi wa Jacob chu xkamanán ankgolh tani wilacha Egipto. \ No newline at end of file diff --git a/24/05.txt b/24/05.txt index f1d03d46..0a2db636 100644 --- a/24/05.txt +++ b/24/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Akit malakgachalh Moisés chu Aarón, kgaakgastakyawa amakgolh egipcios wa liakgastakyaw. akgxni titaxtú uma , chu kgtamakaxtun anta. \v 6 katamakaxtu nak Egipto xalakpuhl , chu titamihl nak pupunu. wa egipcios chu likastalakgolh xputlawan chu ti xkgetawilakgoy kawayu likatlanka xamakgohl lata pupunu xaspinini. -======= -\v 5 \v 6 5 AKIT kmalakgachalh Moisés chu Aarón, chu ka akgastayaw amakgolh egipcios kgampalhuwa liakgastakyaw. Alistalh chu , ktamakaxtun wix. 6 AKIT klimilh xalakmakan latamani xkilhtin Egipto, chu titamilh nak pupunu. Wa egipcios kaliakstalakgolh xputlawkan chu ti xkgetawilakgoy kawayu xlimakgat lata wi Pupunú Xaspinini. ->>>>>>> 8e4e6f7d5b4457fd97bc0479d17e51aea182683c +\v 5 AKIT kmalakgachalh Moisés chu Aarón, chu ka akgastayaw amakgolh egipcios kgampalhuwa liakgastakyaw. Alistalh chu , ktamakaxtun wix. \v 6 AKIT klimilh xalakmakan latamani xkilhtin Egipto, chu titamilh nak pupunu. Wa egipcios kaliakstalakgolh xputlawkan chu ti xkgetawilakgoy kawayu xlimakgat lata wi Pupunú Xaspinini. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 12b17eae..c612481b 100644 --- a/manifest.json +++ b/manifest.json @@ -269,6 +269,8 @@ "23-14", "23-16", "24-title", + "24-01", + "24-03", "24-07", "24-08", "24-14",