Fri Jul 19 2024 16:58:34 GMT-0400 (hora de Bolivia)

15/03.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 3 Lanchú milh kilhtamakú ti mamakgat lilh Israel xwi nixkgalhi tu ni pala makgalhtawakgena chu na nixkgalí limapekgsin. \v 4 Wampi akgxni xtalipuwonimakgilh, xlakain taspinikgolh puchina, x Dioskan xalák Israel, chú putsakgolh, xlákgán makglakgolh. \v 5 Ama kilhtamakú nix anan takaksni wan ti xtalakchokgokgoy, nanipalawá wanti xtalakchokgokgoy un u; nix anan takgaksni, xkgalhikgoy lak hanka taklhuwit xkgotspun ama tachixkuwita ama nak katiyatna.
-=======
-\v 3 Lanchú milh kilhtamakú ti manorakgat lihht Israel xwi nixkgalhi tu xlikana Dios, ni palawa ti palakachiwinan, ni pala makgalhtawakgena chu na nixkgali limapekgsin.  \v 4 Wampi akgxni xtalipuwanimakgolh, xlakan taspinikgolh PUCHINA, xDioskan xalak Israel, chu putsakgolh, xlakgan makglakgolh.  \v 5 Ama Kilhtamaku nixanan takaksni wanti xtalakchokgokgoy, nanipalawá wanti xtalakgchokgokgoy unú; nix anan takgaksni, xkgalhikgoy laktlanka taklhuwit xkgotspun ama tachixkueita ama nak katiyatna.
->>>>>>> ea5f4e63ae1869b83ca564324f1ae2bfcabe1e5c
+\v 3 Lanchú milh kilhtamakú ti manorakgat lihht Israel xwi nixkgalhi tu xlikana Dios, ni palawa ti palakachiwinan, ni pala makgalhtawakgena chu na nixkgali limapekgsin. \v 4 Wampi akgxni xtalipuwanimakgolh, xlakan taspinikgolh PUCHINA, xDioskan xalak Israel, chu putsakgolh, xlakgan makglakgolh. \v 5 Ama Kilhtamaku nixanan takaksni wanti xtalakchokgokgoy, nanipalawá wanti xtalakgchokgokgoy unú; nix anan takgaksni, xkgalhikgoy laktlanka taklhuwit xkgotspun ama tachixkueita ama nak katiyatna.

15/06.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 6 Xtawilanalh kani pala laktsu, laktsú xtalaktuxtamakgonit, lak t lanka kachikininit, xlipas lak t lanka kachikin sampi Dios kamakgaminilh xlipas kilhtamkú tapatin. \v 7 t liwekglh katayanitit, nani kamasta talakaskin wa pala pim, makan nataxláwani, sampi wa mintaskujut nakgalhi xtatain.
-=======
-\v 6 Xtawilanalh kani pala laktsu, laktsu xtalaktuxtamakgonit, lak tlanka kachikininit, xlipa, lak tlanka kachikin, sampi Dios kamakgaminilh xlipas kilhtamaku tapatin.  \v 7 Tliwekglh katayanitit, nani kamasta talakaskin wa pala pimikan nataxla´wani, sampi wa mintaskujut nakgalhi xtatain.
->>>>>>> ea5f4e63ae1869b83ca564324f1ae2bfcabe1e5c
+\v 6 Xtawilanalh kani pala laktsu, laktsu xtalaktuxtamakgonit, lak tlanka kachikininit, xlipa, lak tlanka kachikin, sampi Dios kamakgaminilh xlipas kilhtamaku tapatin. \v 7 Tliwekglh katayanitit, nani kamasta talakaskin wa pala pimikan nataxla´wani, sampi wa mintaskujut nakgalhi xtatain.

15/08.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 8 Akxni Asa kaxmatli uma tachiwin, xmakatsinina Obed wó makatsinina, wá x lá kgalhilh litliwekge chú mapanulh putum tú nixalakgwán xlipaks katiyatna xlá Judá chu Benjamín Chú kachikinin wa xlá tú xkachilenit nax xakatiyatna nak sipi xala Efraín, chú titlawalh akgtum pulaktakilhputan xlá Puchina, wán tu xwi xlakatin nax chiki Puchina. \v 9 Wáxlá kamamakstokli xputumkan Judá chú Benjamín, chú amakgopitsin tixtawilakgolh, tachi x kuwitat xlá Efraín, Manasés chú Simeón. Sampi wa xlakan minkgolh xlák Israel nak xlakatin ihuwá xwankgonit, akgxni ukxilhkgolh wò Puchina Dios xtawilakgolh xlakán.
-=======
-\v 8 Akxni Asa kaxmatli uma tachiwin, xmakatsinina Obed wo makatsinina wá xlá kgalhilh litliwekge chú mapanulh putum tú nixalakgwan xlipaks katiyatna xla Judá chu Benjamin, chu kachikinin wa xla tu xkachilenit nax xakatiyatna nak sipi xala Efrain, chu titlawalh akgtum pulaktakilhputan chu titlawalh akgtum pulaktakilhputan xlo PUCHINA, wan tu xwi xlakatin nax chiki PUCHINA.  \v 9 Waxla kamamakstokli xputumkan Juda chu Benjamin, chu amakgopitsin, tixtawilakgolh, tachixkuwitat xla Efrain, Manases chu Simeon, sampi wa xlakan minkgolh xlak Israel nak xlakatin lhuwa xwankgonit.  Akgxni ukxilhkgolh wa PUCHINA Dios xtawilakgolh xlakan.
->>>>>>> ea5f4e63ae1869b83ca564324f1ae2bfcabe1e5c
+\v 8 Akxni Asa kaxmatli uma tachiwin, xmakatsinina Obed wo makatsinina wá xlá kgalhilh litliwekge chú mapanulh putum tú nixalakgwan xlipaks katiyatna xla Judá chu Benjamin, chu kachikinin wa xla tu xkachilenit nax xakatiyatna nak sipi xala Efrain, chu titlawalh akgtum pulaktakilhputan chu titlawalh akgtum pulaktakilhputan xlo PUCHINA, wan tu xwi xlakatin nax chiki PUCHINA. \v 9 Waxla kamamakstokli xputumkan Juda chu Benjamin, chu amakgopitsin, tixtawilakgolh, tachixkuwitat xla Efrain, Manases chu Simeon, sampi wa xlakan minkgolh xlak Israel nak xlakatin lhuwa xwankgonit.  Akgxni ukxilhkgolh wa PUCHINA Dios xtawilakgolh xlakan.

15/12.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 12 Xlakan makglakgolh xpulakni nak akytum talakikaxlan laki pi naputsakgoy Puchina, wá XDioskan xalakmakgan, xlipaks xnakujkan chu xlipaks xanimakan. \v 13 Wò xlakan xkgalhikgoy aktum talakapastakni wanti ni naputsay Puchina, XDioskan Israel, xlinit naw´wn maski wanti aktsujkú osú t lankata, maski puskat uso chixkú.
-=======
-\v 12 Xlakan makglakgolh xpulakni nakakftum talakkaylan laki pi naputsakgoy PUCHINA, wa xDioskan xalakmakgan, xlipaks xnakujkan chu xlipaks xlistakmakan.  \v 13 Wá xlakan xkgalhikgoy aktum talakapastakn wanti ni naputsay PUCHINA, xDioskan Israel, xlinit nawan maski wanti aktsuku osu tlankata, maski puskat uso chixku.
->>>>>>> ea5f4e63ae1869b83ca564324f1ae2bfcabe1e5c
+\v 12 Xlakan makglakgolh xpulakni nakakftum talakkaylan laki pi naputsakgoy PUCHINA, wa xDioskan xalakmakgan, xlipaks xnakujkan chu xlipaks xlistakmakan. \v 13 Wá xlakan xkgalhikgoy aktum talakapastakn wanti ni naputsay PUCHINA, xDioskan Israel, xlinit nawan maski wanti aktsuku osu tlankata, maski puskat uso chixku.

15/14.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 14 Xlakán malaknunikgolh Puchina nak akgtum tachiwin palhilha, naksanan lislagolikgolh  chu akgalokgot. \v 15 Xlipaks Judá tipaxawakgolh wan tú malaknukgalh, sampi xlakan xmalaknukgonita xlipás xnaykuskan, chú xputsamakgolh Dios xlipas xtayatkan, chú xlakán katakskalh. Wá Puchina kamaxkilh takaksni xlipaks lata nikú wi xlikalhtlanka.
-=======
-\v 14 Xlakan malaknunikgolh PUCHINA nak akgtum tachiwin palh´lha, naksanan, lislgolikgolh chu.  \v 15 Xlipaks Judá tipaxawakgolh wan tu malaknukgalh, sampi xlakan xmapalaknukgonita xlipas xnaykuskan, chu xputsamakgolh Dios xlipas xtayatkan, chu xlakan katakskalh.  Wa PUCHINA kamaxkilh takaksni xlipas lata niku wi xlikalhtlanka.
->>>>>>> ea5f4e63ae1869b83ca564324f1ae2bfcabe1e5c
+\v 14 Xlakan malaknunikgolh PUCHINA nak akgtum tachiwin palh´lha, naksanan, lislgolikgolh chu. \v 15 Xlipaks Judá tipaxawakgolh wan tu malaknukgalh, sampi xlakan xmapalaknukgonita xlipas xnaykuskan, chu xputsamakgolh Dios xlipas xtayatkan, chu xlakan katakskalh.  Wa PUCHINA kamaxkilh takaksni xlipas lata niku wi xlikalhtlanka.

15/16.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 16 Na chuna Chú tmapanukatsinika wámaaca, xnana, wa xá napuxkujnan sampi wa xlá xtlawanit akgtum tatlawlakxtú tu xalixkan xlá Asera.Asa tilakchukú ama tatlawlakxtú xalixkan ,wá xlá tipokgxni t lawakgolh chu tilhkuyú nak xkilhtún puxkga xla Cedrón. \v 17 Wampi antó tixwilakgolh tlak talhman ni katamakgxtukalh xlá Israel. Wampi wó, xnakú Asa xlá xipaks tux kgalhi xlasantificanlay xlenkgalhín. \v 18 Wá xlá limilh nak xchik Dios xlipaks tuxkgalh xtlati chu na chuna tu xla xkgalhi wantu xlakgchan Puchina: xipás xla oro chux la plata. \v 19 Nielh analh taratlaw lati x puxkujnama akgkukitsis kata ama Asa.
-=======
-\v 16 Na chuna chu mapanuka wa Maaca, xnana, wa xa napuxkujnan sampi wa xla xtlawanit akgtum tatlawlakxtu tu xalixkan xla Asera. Asa tilakchuku ama tatlawlakxtu xalixkan wa xla tipokgxni tlawakgolh chu tilhkuyu nak xkilhtun puxkga xla Cedrón.  \v 17 Wampi anto tixwilakgolh tlak talhman ni katamakgxtukalh xla Israel.  Wampi wo xnaku Asa xla xlpaks tux kgalhi xlasantificoloy xlenkgalhin.  \v 18 Wa xla limilh nak xchik Dios xlipaks tuxkgalhi xtlati chu na chuna tu xla xkgalhi wantu xlakgchan PUCHINA: xipaj xlaoro chuxlaplata.  \v 19 Nielh analh taratlaw lati xpuxkujnama akgkukitsis kata ama Asa.
->>>>>>> ea5f4e63ae1869b83ca564324f1ae2bfcabe1e5c
+\v 16 Na chuna chu mapanuka wa Maaca, xnana, wa xa napuxkujnan sampi wa xla xtlawanit akgtum tatlawlakxtu tu xalixkan xla Asera. Asa tilakchuku ama tatlawlakxtu xalixkan wa xla tipokgxni tlawakgolh chu tilhkuyu nak xkilhtun puxkga xla Cedrón. \v 17 Wampi anto tixwilakgolh tlak talhman ni katamakgxtukalh xla Israel.  Wampi wo xnaku Asa xla xlpaks tux kgalhi xlasantificoloy xlenkgalhin. \v 18 Wa xla limilh nak xchik Dios xlipaks tuxkgalhi xtlati chu na chuna tu xla xkgalhi wantu xlakgchan PUCHINA: xipaj xlaoro chuxlaplata. \v 19 Nielh analh taratlaw lati xpuxkujnama akgkukitsis kata ama Asa.