From 10570ab037d5bb3632afb0d450ea1acf7420dbb4 Mon Sep 17 00:00:00 2001 From: michael_rodriguez Date: Mon, 13 Sep 2021 10:35:08 -0400 Subject: [PATCH] Mon Sep 13 2021 10:35:07 GMT-0400 (Eastern Daylight Time) --- 14/01.txt | 6 +----- 14/02.txt | 6 +----- 14/06.txt | 6 +----- 14/08.txt | 6 +----- 14/10.txt | 6 +----- 14/12.txt | 6 +----- manifest.json | 1 - 7 files changed, 6 insertions(+), 31 deletions(-) diff --git a/14/01.txt b/14/01.txt index 5b977c48..299b8856 100644 --- a/14/01.txt +++ b/14/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 14 \v 1 Wa uma xlikalanka katiyatni wantu xkachikin Israel makamakltina la aktum tataín wantu xkamalaknunikanit nak xtiyat canaán, wa mak pistikolh Eleazar xpalakachiwina Dios, chu Josué xkawasa Num, chu xanapuxkun xlikilh tsukut xa pulh xkamanan xkacikin Israel. -======= -\c 14 \v 1 1 Wa uma xlikalanka tiyat wantu xkachikin Israel makamakltina la aktum tataín nak xtiyat canaán, wa makpitsikolh Eleazar xpalakachiwina Dios, chu Josué xkawasa Num, chu xanapuxkun xlikilhtsukut xa pulh xkamanan xkacikin Israel. ->>>>>>> 2787412a4f51281949ea56ef26a4be5ac395b968 +\c 14 \v 1 Wa uma xlikalanka katiyatni wantu xkachikin Israel makamakltina la aktum tataín wantu xkamalaknunikanit nak xtiyat canaán, wa mak pistikolh Eleazar xpalakachiwina Dios, chu Josué xkawasa Num, chu xanapuxkun xlikilh tsukut xa pulh xkamanan xkacikin Israel. \ No newline at end of file diff --git a/14/02.txt b/14/02.txt index 47fedb22..a21aa0c5 100644 --- a/14/02.txt +++ b/14/02.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 2 Wa xtatain ka aktum litlaja lilaksak'ka xla akgnajatsa slikiltsukun xkkamanan, chu xa itat xlikilstsukun xkamanan, chuna la kimpuchinakan xlimapakstinit xpalakata xmakan Moisés. \v 3 wa Moisés xtainit xlhipulakti itat xkamanan liuka xtitaxtunit nak kaltuchoko Jordán, manwa levitas nitu katailh. 4 \v 4 xlikiltsukut xkamanan José xlikana pulakti xwanit, Manasés chu Efraín. Chu ka aktsu taikalh levitas ama katiyatni, manwa antani natawilakoy, chu xtiytkan xla xtakalinkan wantu xpuswenkoy chu xpalhakata wantu xmak lakaskinkoy. \v 5 Xpulataman Israel tlawa chuna lha kimpuchinakan xlimapaksinit Moisés, wa tamapitsilh ama katiyatni. -======= -\v 2 \v 3 \v 4 \v 5 2 Wa xtatainkan ka aktum lalitlaja lilaksak'ka, xla akgnajatsa slikiltsukun xkkamanan wa, chu xa itat xlikilstsukun xkamanan, chuna la kimpuchinakan xlimapakstinit xpalakata xmakan Moisés. 3 wa Moisés xmaxinit tatain ama pulakti itat xlikiltsukut xkamanan, xtitaxtunit nak kaltuchoko Jordán, manwa levitas nitu kamaxikal tatain. 4 Xlikiltsukut xkamanan José xlikana pulakti xwanit, Manasés chu Efraín.Chu ni aktsu tiyat kamaxikalh wantu xkamalaknunikanit ama levitas, manwa kachikinin anta ni nalatamakoy, chu xtiyatkan anta ni na puswayankoy xtakalinkan chu anat ni na makikoy wantu maklakaskinkoy. 5 Tachixkuitat xa lak Israel tlawa chuna la kimpuchinakan xlimapaksinit Moisés, wa tamakpitsilh ama tiyat. ->>>>>>> 2787412a4f51281949ea56ef26a4be5ac395b968 +\v 2 Wa xtatain ka aktum litlaja lilaksak'ka xla akgnajatsa slikiltsukun xkkamanan, chu xa itat xlikilstsukun xkamanan, chuna la kimpuchinakan xlimapakstinit xpalakata xmakan Moisés. \v 3 wa Moisés xtainit xlhipulakti itat xkamanan liuka xtitaxtunit nak kaltuchoko Jordán, manwa levitas nitu katailh. 4 \v 4 xlikiltsukut xkamanan José xlikana pulakti xwanit, Manasés chu Efraín. Chu ka aktsu taikalh levitas ama katiyatni, manwa antani natawilakoy, chu xtiytkan xla xtakalinkan wantu xpuswenkoy chu xpalhakata wantu xmak lakaskinkoy. \v 5 Xpulataman Israel tlawa chuna lha kimpuchinakan xlimapaksinit Moisés, wa tamapitsilh ama katiyatni. \ No newline at end of file diff --git a/14/06.txt b/14/06.txt index 598e2b7d..c294cc4a 100644 --- a/14/06.txt +++ b/14/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Alistalh, xlikiltsukun xkamanan Juda lakminkolh Josué nak Gilgal. Caleb, xkawasa Jefone, wa cenezeo, chu wanilh: "Wix katsiya wantu kimpuchinakan wanil Moisés, xlakskujni Dios, mim palakata chu kimpalakata nak Cades Barnea. \v 7 Akit xa kgaliy tipuxam kata akxni Moisés, xlakskujni kimpuchinkan, ki makamincha nak Cades Barnea laki nak skgalaja uma tiyat. akit klimini tachiwin, chuna lha kilistakni maklkgatsil nak tlaway. -======= -\v 6 \v 7 6 Alistalh, xlikiltsukun xkamanan Juda lakminkolh Josué nak Gilgal. Caleb, xkawasa Jefone, wa cenezeo, wanilh: "Wix katsiya wantu kimpuchinakan wanilh Moisés, xlakskujni Dios, mim palakata chu kimpalakata nak Cades Barnea. 7 Akit xa kgaliy tipuxam kata akxni Moisés, xlakskujni kimpuchinkan, ki makamincha nak Cades Barnea laki nak skgalaja uma tiyat. akit klimini tachiwin, chuna la kilistakni maklkgatsil nak tlaway. ->>>>>>> 2787412a4f51281949ea56ef26a4be5ac395b968 +\v 6 Alistalh, xlikiltsukun xkamanan Juda lakminkolh Josué nak Gilgal. Caleb, xkawasa Jefone, wa cenezeo, chu wanilh: "Wix katsiya wantu kimpuchinakan wanil Moisés, xlakskujni Dios, mim palakata chu kimpalakata nak Cades Barnea. \v 7 Akit xa kgaliy tipuxam kata akxni Moisés, xlakskujni kimpuchinkan, ki makamincha nak Cades Barnea laki nak skgalaja uma tiyat. akit klimini tachiwin, chuna lha kilistakni maklkgatsil nak tlaway. \ No newline at end of file diff --git a/14/08.txt b/14/08.txt index 3f25f390..ebc7de02 100644 --- a/14/08.txt +++ b/14/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 chu wa kinatalanin wanti kinta ankolh makapekuankolh slistaknikan tachixkuitat. wa akit klipawa kimpuchina Dios. \v 9 Moisés malaknulh ama kiltamaku chu wa: "xlikana ama tiyat wantu min tantun tlawanit na lhakgalamakana wix chu min kamanan xliankalin, man wix akstitum stalaninita kimpuchina Dios." -======= -\v 8 \v 9 8 chu wa kinatalanin wanti kinta ankolh makapekuankolh slistaknikan tachixkuitat. wa akit klipawa kimpuchina Dios. 9 Moisés malaknulh ama kiltamaku chu wa: "xlikana ama tiyat wantu min tantun tlawanit na lhakgalamankana wix chu min kamanan xliankgalin, man wix akstitum stalaninita puchina Dios." ->>>>>>> 2787412a4f51281949ea56ef26a4be5ac395b968 +\v 8 chu wa kinatalanin wanti kinta ankolh makapekuankolh slistaknikan tachixkuitat. wa akit klipawa kimpuchina Dios. \v 9 Moisés malaknulh ama kiltamaku chu wa: "xlikana ama tiyat wantu min tantun tlawanit na lhakgalamakana wix chu min kamanan xliankalin, man wix akstitum stalaninita kimpuchina Dios." \ No newline at end of file diff --git a/14/10.txt b/14/10.txt index 5b72ea87..06e04230 100644 --- a/14/10.txt +++ b/14/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Chu kaukxti! Kimpuchina kimaxinit uma tipuxamakitsis kata, lha chuna wa: milh killtamaku akxni kimpuchinakan wanilh uma tachiwin Moisés, akxni Israel tlahualh nak xakaskagni tiyat. Chu kaukxti! chu lanchu kgalhi tatipuxamakitsis kata. \v 11 Lanchu uma kilhtamaku chunku kgaliy litliweke la xa kgalhi ama kiltamaku akxni Moisés kimakalh. kilitliweweke chunku lha xwanit, laki nakan chuna nak min chu nak talanan. -======= -\v 10 \v 11 10 Chu ka ukxti! Kimpuchina kimaxinit uma tipuxamakitsis kata, lha chuna wa: milh killtamaku akxni kimpuchinakan wanilh uma tachiwin Moisés, akxni Israel tlahualh nak xakaskagni tiyat. Chu kaukxti! chu lanchu kgalhi tatipuxamakitsis kata. 11 Lanchu uma kilhtamaku chunaku kgaliy litliweke la xa kgalhi ama kiltamaku akxni Moisés kimakalh. kilitliweweke chunku la xwanit, laki nakan chuna nak min chu nak talanan. ->>>>>>> 2787412a4f51281949ea56ef26a4be5ac395b968 +\v 10 Chu ka ukxti! Kimpuchina kimaxinit uma tipuxamakitsis kata, lha chuna wa: milh killtamaku akxni kimpuchinakan wanilh uma tachiwin Moisés, akxni Israel tlahualh nak xakaskagni tiyat. Chu kaukxti! chu lanchu kgalhi tatipuxamakitsis kata. \v 11 Lanchu uma kilhtamaku chunaku kgaliy litliweke la xa kgalhi ama kiltamaku akxni Moisés kimakalh. kilitliweweke chunku la xwanit, laki nakan chuna nak min chu nak talanan. \ No newline at end of file diff --git a/14/12.txt b/14/12.txt index e17acc6f..ca1ac2f5 100644 --- a/14/12.txt +++ b/14/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Chu. xli makwa, kakimaxki, uma tiyat kasipijni, wantu kimpuchinakan xkimalaknunanit ama kilhtamaku. man Wix kaxpat'ti ama kilhtamaku, wampi anaceos anta xwilakolh laklanka chu laktliweke pulataman xtawanit. wampi kimpuchinakan kintalama chu akit nak katamaxtuy lha chihuina kimpuchina ." -======= -\v 12 12 Chu. xli makwa, kakimaxki, uma tiyat kasipijni, wantu puchina xkimalaknuninit ama kilhtamaku. Man Wix kaxpat'ti ama kilhtamaku, wampi anaceos anta xwilakolh laklanka chu laktliweke pulataman xtawanit. wampi kimpuchinakan kintalama chu akit nak katamaxtuy la chiwina kimpuchina." ->>>>>>> 2787412a4f51281949ea56ef26a4be5ac395b968 +\v 12 Chu. xli makwa, kakimaxki, uma tiyat kasipijni, wantu puchina xkimalaknuninit ama kilhtamaku. Man Wix kaxpat'ti ama kilhtamaku, wampi anaceos anta xwilakolh laklanka chu laktliweke pulataman xtawanit. wampi kimpuchinakan kintalama chu akit nak katamaxtuy la chiwina kimpuchina." \ No newline at end of file diff --git a/manifest.json b/manifest.json index 6ca65082..7eccbbc7 100644 --- a/manifest.json +++ b/manifest.json @@ -167,7 +167,6 @@ "14-06", "14-08", "14-10", - "14-12", "14-13", "15-title", "15-01",