From f0dbf27b1da826fe4c3b360596dec7e51db6cdeb Mon Sep 17 00:00:00 2001 From: michael_rodriguez Date: Wed, 15 Sep 2021 11:18:39 -0400 Subject: [PATCH] Wed Sep 15 2021 11:18:38 GMT-0400 (Eastern Daylight Time) --- 24/09.txt | 6 +----- 24/11.txt | 6 +----- 24/13.txt | 6 +----- 24/14.txt | 2 +- 24/16.txt | 2 +- manifest.json | 7 +++++-- 6 files changed, 10 insertions(+), 19 deletions(-) diff --git a/24/09.txt b/24/09.txt index 7942772d..8cbb6890 100644 --- a/24/09.txt +++ b/24/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Alistalh Balac xkgawasa Zipor, puxku xalak Moab, titakicha chu talatlhawa Israel . Wa makalh chu maktasilh xpalakata Balaam, xkgawasa Beor, laki nalakapalay . \v 10 wampi akit ni kaxmanit wa Balaam . wampi wa, xla kasikulhnalilh. chu na chu kalakmaxtun nak xmakan. -======= -\v 9 \v 10 9 Alistalh Balac xkgawasa Zipor, puxku xalak Moab, ti takichá chu talatlhawa Israel . WA malakacalh chu kilhkanilh Balaam, xkgawasa Beor, laki chu nakamapatiniyan . 10 Wampi AKIT ni kaxmanilh Balaam. xlikana, WA kasikulhnalin. Chuná chu kalakmaxtun nak xmakan. ->>>>>>> 8e4e6f7d5b4457fd97bc0479d17e51aea182683c +\v 9 Alistalh Balac xkgawasa Zipor, puxku xalak Moab, ti takichá chu talatlhawa Israel . WA malakacalh chu kilhkanilh Balaam, xkgawasa Beor, laki chu nakamapatiniyan . \v 10 Wampi AKIT ni kaxmanilh Balaam. xlikana, WA kasikulhnalin. Chuná chu kalakmaxtun nak xmakan. \ No newline at end of file diff --git a/24/11.txt b/24/11.txt index 1fcf96ba..e8962693 100644 --- a/24/11.txt +++ b/24/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 wixinan pitit akx kalihtuchokgo Jordán chu chipitit nak Jericó. wa xamapeksina nak Jericó talatlhawanankgolh kamimpalakatakan, xlipask amorreos, xalak ferezeos, cananeos, hititas, gergeseos, heveos chu xalak jebuseos. akit kamakteilelh chu kalakatitayalh \v 12 Akit kamanilh kgalat milakatinkan , wanti talelh amakgol xchatikan mapekgsina xala amorreos, lakimpi natsalakgoy. wa uma tu nitu litxtulh xlimakawkan nachu xlitalatni. -======= -\v 11 \v 12 11Wixinan pitit xkalhni Jordán chu chipitit nak Jericó. Wa mapekgsinanín xalak Jericó katalatlhawakgon, xlipaks amorreos, ferezeos, cananeos, hititas, gergeseos, heveos chu jebuseos. AKIT kamaxkin tatlajan xkgospun xlakan chu kawilih pi natapekgsinikoy 12 AKIT malakachalh lhuwa kgalat milakatinkan , wanti kalhenikahl amakgol xchatikan puxkunannin xalak amorreos ,laki pi natsalakgoy. chu xla uma nichuna lhahl xpalakata spada chu xlitalakna. ->>>>>>> 8e4e6f7d5b4457fd97bc0479d17e51aea182683c +\v 11 Wixinan pitit xkalhni Jordán chu chipitit nak Jericó. Wa mapekgsinanín xalak Jericó katalatlhawakgon, xlipaks amorreos, ferezeos, cananeos, hititas, gergeseos, heveos chu jebuseos. AKIT kamaxkin tatlajan xkgospun xlakan chu kawilih pi natapekgsinikoy \v 12 AKIT malakachalh lhuwa kgalat milakatinkan , wanti kalhenikahl amakgol xchatikan puxkunannin xalak amorreos ,laki pi natsalakgoy. chu xla uma nichuna lhahl xpalakata spada chu xlitalakna. \ No newline at end of file diff --git a/24/13.txt b/24/13.txt index 00257b1e..0aa691dd 100644 --- a/24/13.txt +++ b/24/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Kit kamaxki tiyat anta ni nituxwanit taskujut chu kachikinin wantu wixin ni lakaxwilinitantit, chu lanchu ant ni lapatit. wixinan wapatit xtawakat ama tachanan chu tu tlan tachanit xla olivas wamtu ni chanitantit. -======= -\v 13 13 AKIT kamaxkin tiyat hua tu ni wixinan liskujtit chu kachikinin wantu ni wixinan lakaxwilinitantit, chu lanchiyú anta wilatit. Wixinan wapatit xtawakat kiwin , wantu ni chanitantit . ->>>>>>> 8e4e6f7d5b4457fd97bc0479d17e51aea182683c +\v 13 AKIT kamaxkin tiyat hua tu ni wixinan liskujtit chu kachikinin wantu ni wixinan lakaxwilinitantit, chu lanchiyú anta wilatit. Wixinan wapatit xtawakat kiwin , wantu ni chanitantit . \ No newline at end of file diff --git a/24/14.txt b/24/14.txt index c0941c19..bceda03f 100644 --- a/24/14.txt +++ b/24/14.txt @@ -1 +1 @@ -\v 15 \v 14 Chu lanchu kapekuanitit PUCHINA chu kalaktakilhputatit kakajnitit wan tu xlikana; kamatampuxtutit tamakanitlaw wantu xlakgachixkuwimakgolh xamakgán minatlatnakan pekganachá Eufrates chu Egipto, chu kalakgatakilhputatit PUCHINA. 15 Palpi nilakgatiyatit nak xlakatin milakastapukan kaknaniyatit PUCHINA , kalaksaktit wixinan uma kilhtamaku , xa tiku nalakgskunaniyatit , wa amá tamakanitlaw wantu lakgatakilhputakgolh xamakgán minatlaknakan pekganacha Eufrates, chi wa xtamakanitlaukan amorreos, nak katiyayna tani huilatit , "Wampi akit chu kinkamán naklakachixkuwiyaw PUCHINA. \ No newline at end of file +\v 14 Chu lanchu kapekuanitit PUCHINA chu kalaktakilhputatit kakajnitit wan tu xlikana; kamatampuxtutit tamakanitlaw wantu xlakgachixkuwimakgolh xamakgán minatlatnakan pekganachá Eufrates chu Egipto, chu kalakgatakilhputatit PUCHINA. \v 15 Palpi nilakgatiyatit nak xlakatin milakastapukan kaknaniyatit PUCHINA , kalaksaktit wixinan uma kilhtamaku , xa tiku nalakgskunaniyatit , wa amá tamakanitlaw wantu lakgatakilhputakgolh xamakgán minatlaknakan pekganacha Eufrates, chi wa xtamakanitlaukan amorreos, nak katiyayna tani huilatit , "Wampi akit chu kinkamán naklakachixkuwiyaw PUCHINA. \ No newline at end of file diff --git a/24/16.txt b/24/16.txt index 38e24c32..af767bf9 100644 --- a/24/16.txt +++ b/24/16.txt @@ -1 +1 @@ -\v 17 \v 18 \v 16 Wa chu tachixkuwitat kgalhtinalh chuné wa: Akinan niukxní ktimakgaxtakgwi wa PUCHINA lakimpi nak lakgachixkuwiyaw tamakanitlaw.17 wa PUCHINA Dios wa ti kinkalimin chu kinatlanakan xalakgmakgán nak xtiyat Egipto, xatachín xakuilanaw, wa tlawalh laktlanka likakni wa tu man kilakgastapukan kliukxilhwi, wa ti kinkamagtakgalhni nak tiji chu laktlanka kachikinín taní ktitaxtú. 18 Wa PUCHINA tamakaxtu kilakatinkan putum tachixkuwitat, wa ama amorreos ti xlamakgolh uma katiyatna . Na chuna chu akinan nak lakgatakilhputayaw PUCHINA, sampi Wa xla kintlatikan Dios. \ No newline at end of file +\v 16 Wa chu tachixkuwitat kgalhtinalh chuné wa: Akinan niukxní ktimakgaxtakgwi wa PUCHINA lakimpi nak lakgachixkuwiyaw tamakanitlaw.\v 17 wa PUCHINA Dios wa ti kinkalimin chu kinatlanakan xalakgmakgán nak xtiyat Egipto, xatachín xakuilanaw, wa tlawalh laktlanka likakni wa tu man kilakgastapukan kliukxilhwi, wa ti kinkamagtakgalhni nak tiji chu laktlanka kachikinín taní ktitaxtú. \v 18 Wa PUCHINA tamakaxtu kilakatinkan putum tachixkuwitat, wa ama amorreos ti xlamakgolh uma katiyatna . Na chuna chu akinan nak lakgatakilhputayaw PUCHINA, sampi Wa xla kintlatikan Dios. \ No newline at end of file diff --git a/manifest.json b/manifest.json index c612481b..1ecfb500 100644 --- a/manifest.json +++ b/manifest.json @@ -271,9 +271,12 @@ "24-title", "24-01", "24-03", + "24-05", "24-07", "24-08", - "24-14", - "24-16" + "24-09", + "24-11", + "24-13", + "24-14" ] } \ No newline at end of file