diff --git a/13/32.txt b/13/32.txt index fe8e4262..4347735c 100644 --- a/13/32.txt +++ b/13/32.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 32 Hua uma tiyath tu Moisés camaxquilh xlakgskgatan Dios tani xacaxtum Moab, tlakg pekganacha kgalhtuchokgo Jordán, xtampajan Jericó. \v 33 Moisés nicamaxquilh tiyath Levi. Puchiná, Dios xalac_Israel, hua xtataquincan, chuna la ti cahuanica. -======= -\v 32 \v 33 32 Hua uma tiyath tu Moisés camaxquilh xcamanan Manasés tani xacaxtum Moab, tlakg pekganacha kgalhtuchokgo Jordán, (tani pulha chichiní)xtampajan Jericó. 33 Moisés nicamaxquilh tiyath Levi. Puchiná, Dios xalac_Israel, hua nacamahuí, chuná la ti cahuanica. ->>>>>>> fb95651d8cb99917d94f91d1b6bd69035841681b +\v 32 Hua uma tiyath tu Moisés camaxquilh xlakgskgatan Dios tani xacaxtum Moab, tlakg pekganacha kgalhtuchokgo Jordán, xtampajan Jericó. \v 33 Moisés nicamaxquilh tiyath Levi. Puchiná, Dios xalac_Israel, hua xtataquincan, chuna la ti cahuanica. \ No newline at end of file diff --git a/14/01.txt b/14/01.txt index 75d2694d..299b8856 100644 --- a/14/01.txt +++ b/14/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 14 \v 1 Wa uma xlikalanka katiyatni wantu xpulataman Israel makamakltina la aktum tataín nak katiyatni canaán, wa makpistikolh curakni Eleazar, wa Josué xkawasa Num, chu xanapuxkun xlikilh stukut xa pulh xkamanan pulataman Israel. -======= -\c 14 \v 1 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. ->>>>>>> aae69c3444f68d21a8a3af977013cd0276fef6ff +\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 1f267156..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 xtatain ka aktum litlaja lilaksak'ka, xla akgnajatsa slikiltsukun xkkamanan wa, chu xa itat xlikilstsukun xkamanan, chuna la kimpuchinakan xlimapakstinit xpalakata xmakan Moisés. 3 wa Moisés xkamaxkinita tatain wantu xkamalaknunikanit ama pulakti itat xlikiltsukut xkamanan Israel, xtitaxtunit nak kaltuchoko Jordán, manwa levitas nitu kamaxikal tatain. 4 xlikiltsukut xkamanan José xlikana pulakti xwanit, Manasés chu Efraín. Chu ni tu kamaxkikalh tatain wantu xkamalaknunikanit ama levitas nak katiyatni, manwa kachikinin anta ni nalatamakoy, chu xtiyatkan anta ni na xpuswenkoy xtakalinkan chu anat ni na makikoy wantu maklakaskinkoy. 5 Tachixkuitat xa lak Israel tlawa chuna lha kimpuchinakan xlimapaksinit Moisés, wa tamakpitsilh ama katiyatni. ->>>>>>> aae69c3444f68d21a8a3af977013cd0276fef6ff +\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 c4dda90b..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 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, chu wanilh: "Wix katsiya wantu kimpuchinakan wanil 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 lha kilistakni maklkgatsil nak tlaway. ->>>>>>> aae69c3444f68d21a8a3af977013cd0276fef6ff +\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/title.txt b/14/title.txt new file mode 100644 index 00000000..20937b7d --- /dev/null +++ b/14/title.txt @@ -0,0 +1 @@ +Capítulo 14 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 5b2614cf..e16c1a2a 100644 --- a/manifest.json +++ b/manifest.json @@ -134,6 +134,12 @@ "13-22", "13-24", "13-27", + "13-29", + "13-32", + "14-title", + "14-01", + "14-02", + "14-06", "14-08", "14-10", "14-12",