diff --git a/22/01.txt b/22/01.txt index 3f886192..bdae268b 100644 --- a/22/01.txt +++ b/22/01.txt @@ -1 +1 @@ -\c 22 \v 1 \v 2 1 Chu ama kiltamaku Josué katasanilh rubenitas, gaditas chu xa itat xlikiltsukut xkamanan Manasés. 2 Chu kawanilh: "wixinan tlawanintit xlipaks wantu Moisés xlak'skujni PUCHINA kamakamaxin.. wixinan kgalhakaxpat'tit kinachiwin wantu kalimapaksin. 3 \v 3 wixinan ni makxtaknintit minatalankan xlipaks kiltamaku, chu la uma kiltamaku. Chu makgantaxtitit mintalitaykan wa xlimapaksin puchina Dios. \ No newline at end of file +\c 22 \v 1 Chu ama kiltamaku Josué katasanilh rubenitas, gaditas chu xa itat xlikiltsukut xkamanan Manasés. \v 2 Chu kawanilh: "wixinan tlawanintit xlipaks wantu Moisés xlak'skujni PUCHINA kamakamaxin.. wixinan kgalhakaxpat'tit kinachiwin wantu kalimapaksin. \v 3 ni makxtaknintit minatalankan xlipaks kiltamaku, chu la uma kiltamaku. Chu makgantaxtitit mintalitaykan wa xlimapaksin puchina Dios. \ No newline at end of file diff --git a/22/04.txt b/22/04.txt index 259dc427..74525886 100644 --- a/22/04.txt +++ b/22/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 lanchu puchina Dios kamaxinit tajaxni xnatalanin,wuantu xkamalaknuninit.manwa kataspitit nak minchiki. kan katiyatni milakan wuantu Moisés xlakujni puchina kamaxkil xakiltutu Jordan. \v 5 kuenta katlawatit laki namakantaxtiyatit xtalakaxtlan chu xlimapaksin wuantu Moises xlakskujni puchina mi Dios, pina tlawaya xliputum xkatijin,chu na makiya xlimapaksin,chu nastalaniya nalaktgakilputuya xliputum minaku chu xliputum milistakna. \v 6 chuna Josué kasikulnalilh chu kamaspitli chu xlakan taspitkol nak chikikan. -======= -\v 4 \v 5 \v 6 4 Lanchu PUCHINA DIOS kamaxinit tajaxni xnatalanin,wuantu kamalaknunilh. Manwa kataspitit nak minchikikan nak tiyat wantu milakan, wantu Moisés xlaskujni puchina kamaxkil xakiltutu Jordan. 5 kuenta katlawatit laki namakantaxtiyatit xtalakaxtlan chu xlimapaksin wantu Moises xlakskujni puchina Dios kamakamaxin, napaxkiyatit PUCHINA DIOS, natlawana nak xliputum xkatijin, chu na makiya xlimapaksin, chu nastalaniya chu nalakgachixkuwiya xliputum minaku chu xliputum milistakni. 6 Chuna Josué kasikulnalilh chu kamaspitli, chu xlakan taspitkolh nak chikikan. ->>>>>>> d363695520fff37eb0a10b8ebab67ffdead69e10 +\v 4 Lanchu PUCHINA DIOS kamaxinit tajaxni xnatalanin, wuantu kamalaknunilh. Manwa kataspitit nak minchikikan nak tiyat wantu milakan, wantu Moisés xlaskujni puchina kamaxkil xakiltutu Jordan. \v 5 kuenta katlawatit laki namakantaxtiyatit xtalakaxtlan chu xlimapaksin wantu Moises xlakskujni puchina Dios kamakamaxin, napaxkiyatit PUCHINA DIOS, natlawana nak xliputum xkatijin, chu na makiya xlimapaksin, chu nastalaniya chu nalakgachixkuwiya xliputum minaku chu xliputum milistakni. \v 6 Chuna Josué kasikulnalilh chu kamaspitli, chu xlakan taspitkolh nak chikikan. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 5149b98f..8735c902 100644 --- a/manifest.json +++ b/manifest.json @@ -218,6 +218,7 @@ "20-title", "21-title", "22-title", + "22-01", "22-09", "22-12", "22-13",