From 800d5e4e5322ad973f1df8d1f57b2d5c5ed961e6 Mon Sep 17 00:00:00 2001 From: michael_rodriguez Date: Mon, 13 Sep 2021 10:37:08 -0400 Subject: [PATCH] Mon Sep 13 2021 10:37:07 GMT-0400 (Eastern Daylight Time) --- 14/13.txt | 6 +----- 15/01.txt | 2 +- 15/03.txt | 2 +- 15/05.txt | 2 +- 15/07.txt | 2 +- manifest.json | 2 +- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/14/13.txt b/14/13.txt index 541ad719..b6cd3979 100644 --- a/14/13.txt +++ b/14/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Alistalh, Josué sikulnalilh chu maxilh katiyatni Hebrón la aktum tatain Caleb xkawasa Jefone. \v 14 Xlimakwa, Hebrón xla xtatain wa Caleb, xkawasa Jefone wa eneceo lanchu chu xliankgalin xlimakwa stalaninit akstitum puchina Dios xla Israel. \v 15 Lanchu, xtakuwini Hebrón titaxtulh kiltamaku xwanit Quiriat Arba. ( Arba tlak xa tlan xtakuwini xwanit ama chixku xlakstipan anaceos.) Chu ama kaytiyatni kaks tawilakolh chu ni lha talakolh. -======= -\v 13 \v 14 \v 15 13 Alistalh, Josué sikulnalilh chu tailh ama tiyat xla Hebrón wa Caleb xkawasa Jefone . 14 Xlimakwa, Hebrón xla xtatain wa Caleb, xkawasa Jefone wa eneceo lanchu uma kiltamaku sampi akstitum xstalaninit puchina Dios xla Israel. 15 Lanchu, Hebrón titaxtulh kiltamaku xwanit Quiriat Arba. ( Arba tlak xa tlan xwanit ama chixku xlakstipan anaceos.) Chu ama kaytiyatni kaks tawilakolh chu ni la talakolh. ->>>>>>> 2787412a4f51281949ea56ef26a4be5ac395b968 +\v 13 Alistalh, Josué sikulnalilh chu maxilh katiyatni Hebrón la aktum tatain Caleb xkawasa Jefone. \v 14 Xlimakwa, Hebrón xla xtatain wa Caleb, xkawasa Jefone wa eneceo lanchu chu xliankgalin xlimakwa stalaninit akstitum puchina Dios xla Israel. \v 15 Lanchu, xtakuwini Hebrón titaxtulh kiltamaku xwanit Quiriat Arba. ( Arba tlak xa tlan xtakuwini xwanit ama chixku xlakstipan anaceos.) Chu ama kaytiyatni kaks tawilakolh chu ni lha talakolh. \ No newline at end of file diff --git a/15/01.txt b/15/01.txt index 1022e7bf..cb916cb0 100644 --- a/15/01.txt +++ b/15/01.txt @@ -1 +1 @@ -\c 15 \v 1 \v 2 1 Wantu makamaxika tiyat xlikiltsukt xkamanan xkachikin Juda, chu makpitsinika xlilakapasni, xkichan pakalhu xkilpan katiyatni Edom, nak xakaskagni tiyat Zin, wa uma tiyat tlak xa makat nak xa pakalhu. 2 Xlipakan nak xa pakalhu xkichan nak xlisputni pupunu xa skoko, xlikiltsukun ni kitanuy pupunu nak tiyat nak pakalhu. \ No newline at end of file +\c 15 \v 1 Wantu makamaxika tiyat xlikiltsukt xkamanan xkachikin Juda, chu makpitsinika xlilakapasni, xkichan pakalhu xkilpan katiyatni Edom, nak xakaskagni tiyat Zin, wa uma tiyat tlak xa makat nak xa pakalhu. \v 2 Xlipakan nak xa pakalhu xkichan nak xlisputni pupunu xa skoko, xlikiltsukun ni kitanuy pupunu nak tiyat nak pakalhu. \ No newline at end of file diff --git a/15/03.txt b/15/03.txt index 23b32c1e..315642dd 100644 --- a/15/03.txt +++ b/15/03.txt @@ -1 +1 @@ -\v 3 \v 4 3 Chu anta ni xkisputa nak pakalhu kasipijni Acrabim chu xtitaxtuy lakatsu Zin, chu xkichan pkalhu Cades Barnea, lakatsu Hezrón, chu pakxtu xkichan nak Adar, nix kitaspita chu xchan antá Carca. 4 Xtitaxtuy lkatsu Asmón, xtitaxtuy nak puxka Egipto chu xchan nak xlisputni pupunu. Wa uma xlisputni xwanit nak xpakgalhjú. \ No newline at end of file +\v 3 Chu anta ni xkisputa nak pakalhu kasipijni Acrabim chu xtitaxtuy lakatsu Zin, chu xkichan pkalhu Cades Barnea, lakatsu Hezrón, chu pakxtu xkichan nak Adar, nix kitaspita chu xchan antá Carca. \v 4 Xtitaxtuy lkatsu Asmón, xtitaxtuy nak puxka Egipto chu xchan nak xlisputni pupunu. Wa uma xlisputni xwanit nak xpakgalhjú. \ No newline at end of file diff --git a/15/05.txt b/15/05.txt index 60bf4564..5b1fd08b 100644 --- a/15/05.txt +++ b/15/05.txt @@ -1 +1 @@ -\v 6 \v 5 5 Xkiltum wa xwanit uma pupunu xa skoko, anta ni xkisputa kaltuchuko Jordán. Xlipakan nak xa pakxtu, xkiltsukuy anta ni xkitanuy pupunu nak katiyatni nix kisputa kaltuchoko Jordán. 6 Xkichan nak Bet Hogla chu xtitaxtuy lakatsu nak xtipakxtú Bet Arabá. Chu xkichan antani wi aktum lanka chiwix Xla Bohán xkawasa Rubén. \ No newline at end of file +\v 5 Xkiltum wa xwanit uma pupunu xa skoko, anta ni xkisputa kaltuchuko Jordán. Xlipakan nak xa pakxtu, xkiltsukuy anta ni xkitanuy pupunu nak katiyatni nix kisputa kaltuchoko Jordán. \v 6 Xkichan nak Bet Hogla chu xtitaxtuy lakatsu nak xtipakxtú Bet Arabá. Chu xkichan antani wi aktum lanka chiwix Xla Bohán xkawasa Rubén. \ No newline at end of file diff --git a/15/07.txt b/15/07.txt index 85a6d31f..366be7d6 100644 --- a/15/07.txt +++ b/15/07.txt @@ -1 +1 @@ -\v 8 \v 7 7 Wa xlipakan uma tiyat xkichan nak Debir, xkiltsukuy nak xa kaxtum Acor, nachuna xkichan nak xa pakxtu, xkitamakspita nak Gilgal, anta ni xalakaputu xakstipun sipi xla Adumín, wantu wi xmakni pakgalhjú xa kaxtum. Alistalh, xlipakan xtitaxtuy lakatsu nix taxtuy chuchut xla Semes chu xkichan anta Rogel. 8 Alistalh, xtitaxtuy nak xa kaxtum Ben Hinom nak xa pakgalhjú xkachikin Jebús ( watiya Jerusalén). Chu xkichan nak xaks'tipun sipi wantu kichan nak xa kaxtum Hinom,nak xa pakaxuki anta ni tsankay chichini, anta ni xa pakxtu ni kisputa xa kaxtum Refaim \ No newline at end of file +\v 7 Wa xlipakan uma tiyat xkichan nak Debir, xkiltsukuy nak xa kaxtum Acor, nachuna xkichan nak xa pakxtu, xkitamakspita nak Gilgal, anta ni xalakaputu xakstipun sipi xla Adumín, wantu wi xmakni pakgalhjú xa kaxtum. Alistalh, xlipakan xtitaxtuy lakatsu nix taxtuy chuchut xla Semes chu xkichan anta Rogel. \v 8 Alistalh, xtitaxtuy nak xa kaxtum Ben Hinom nak xa pakgalhjú xkachikin Jebús ( watiya Jerusalén). Chu xkichan nak xaks'tipun sipi wantu kichan nak xa kaxtum Hinom,nak xa pakaxuki anta ni tsankay chichini, anta ni xa pakxtu ni kisputa xa kaxtum Refaim \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7eccbbc7..a483ba85 100644 --- a/manifest.json +++ b/manifest.json @@ -167,13 +167,13 @@ "14-06", "14-08", "14-10", + "14-12", "14-13", "15-title", "15-01", "15-03", "15-05", "15-07", - "15-09", "15-11", "15-13", "15-16",