From 10248ca0970c7121429c7f343a73b056d523b7a0 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Wed, 27 Apr 2022 21:41:39 -0400 Subject: [PATCH] Wed Apr 27 2022 21:41:38 GMT-0400 (Paraguay Standard Time) --- 39/08.txt | 6 +----- 39/14.txt | 6 +----- 39/17.txt | 6 +----- 39/21.txt | 6 +----- 39/22.txt | 6 +----- 39/36.txt | 6 +----- 39/40.txt | 6 +----- 39/42.txt | 6 +----- 40/24.txt | 6 +----- 9 files changed, 9 insertions(+), 45 deletions(-) diff --git a/39/08.txt b/39/08.txt index 3868471e..3ea9cb89 100644 --- a/39/08.txt +++ b/39/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 xla tlawalh xkuxmún ama talhakgan, xtaskujut chatum ti skulujwa, chuná la tlawakan klhakgat palijni. Tlawa xa oro, lhakgat xa spupuku, xa smantajwa chu xaspinini chu xa snapapa lhakgat. \v 9 ka statijwa. xlakán kgapskgolh ama kilhmaktiy xkuxmún lhakgat. akgtum kuarta xli lhman chu xlititlanka. -======= -\v 8 xla tlawalh xkuxmún ama talhakgan, xtaskujut chatum ti skulujwa, chuná la tlawakan klhakgat palijni. Tlawa xa oro, lhakgat xa spupuku, xa smantajwa chu xaspinini chu xa snapapa lhakgat. \v 9 statijwa xwanit. xlakán kgapskgolh ama kilhmaktiy xkuxmún lhakgat. akgtum kuarta xli lhman chu xlititlanka. ->>>>>>> f99b3927bea3624650e369702b8fdcd9913aa734 +\v 8 xla tlawalh xkuxmún ama talhakgan, xtaskujut chatum ti skulujwa, chuná la tlawakan klhakgat palijni. Tlawa xa oro, lhakgat xa spupuku, xa smantajwa chu xaspinini chu xa snapapa lhakgat. \v 9 statijwa xwanit. xlakán kgapskgolh ama kilhmaktiy xkuxmún lhakgat. akgtum kuarta xli lhman chu xlititlanka. \ No newline at end of file diff --git a/39/14.txt b/39/14.txt index aa68147a..654100b6 100644 --- a/39/14.txt +++ b/39/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Umakgolh chiwix kaxmawkakalh lata xtakuwinikán kgalhakutiy xkamán Israel, putúm akgatunu xtakuwinikán. chuna la lakapitikhkan anilu xla litamakatakan (sello), akgatunu takuwini xwaniputún pulakatunu xa akgkutiy xkilhtsukutkan xkamán Israel. \v 15 nak xkuxmún tlawakgolh cadena xtachuná la tasiw, takgonkgxni xa oro. \v 16 Tlawakgolh akgtiy tatsapa xa oro chu akgtiy tu la anilu xa oro chu mawakakgolh ama akgtiy anilu xmekgstanin xkuxmún lhakgat. -======= -\v 14 Umakgolh chiwix kaxmawkakalh lata xtakuwinikán kgalhakutiy xkamán Israel, putúm akgatunu xtakuwinikán. chuna la lakapitikhkan anilu xla litamakatan (sello), akgatunu takuwini xwaniputún pulakatunu xa akgkutiy xkilhtsukutkan xkamán Israel. \v 15 nak xkuxmún tlawakgolh takgon'xni xtachuná la tasiw, takgon'xni xa oro. \v 16 Tlawakgolh akgtiy tatsapa xa oro chu akgtiy tu la anilu xa oro chu mawakakgolh ama akgtiy anilu xmekgstanin xkuxmún lhakgat. ->>>>>>> f99b3927bea3624650e369702b8fdcd9913aa734 +\v 14 Umakgolh chiwix kaxmawkakalh lata xtakuwinikán kgalhakutiy xkamán Israel, putúm akgatunu xtakuwinikán. chuna la lakapitikhkan anilu xla litamakatan (sello), akgatunu takuwini xwaniputún pulakatunu xa akgkutiy xkilhtsukutkan xkamán Israel. \v 15 nak xkuxmún tlawakgolh takgon'xni xtachuná la tasiw, takgon'xni xa oro. \v 16 Tlawakgolh akgtiy tatsapa xa oro chu akgtiy tu la anilu xa oro chu mawakakgolh ama akgtiy anilu xmekgstanin xkuxmún lhakgat. \ No newline at end of file diff --git a/39/17.txt b/39/17.txt index fe8980f5..5c87c4b4 100644 --- a/39/17.txt +++ b/39/17.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD -\v 17 Xlakán mawakakgolh kgantiy xatakgonkgxni oro nak akgtiy stilili likan xmekgstan xkuxmún lhakgat. \v 18 Xlakán makilhstukkgolh takgonkgxni nak xpekgxtun lhakgat. -======= \v 17 Xlakán mawakakgolh kgantiy xatakgon'xni oro nak akgtiy stilili likan xmekgstan xkuxmún lhakgat. \v 18 Xlakán makilhstukkgolh takgon'xni nak xpekgxtun lhakgat. -Xlakán akxtúm ta'mawkakgolh xpekgxtún lhakgat. ->>>>>>> f99b3927bea3624650e369702b8fdcd9913aa734 +Xlakán akxtúm ta'mawkakgolh xpekgxtún lhakgat. \ No newline at end of file diff --git a/39/21.txt b/39/21.txt index 50e3e41c..86a9a8a4 100644 --- a/39/21.txt +++ b/39/21.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 21 Xlakán lichiwakakgolh stilili likán xalak xkuxmún nak stilili likán nak xa lhakgat, maklakaskinkgolh takgonkgxni xaspupuku, laki chuna lan natawakaj nak lhakgat. wa xlakata ni nataxkuttaktay xkuxmún talhakgán. chuna tlawakalh la Puchiná xlimapekgsinit Moisés. -======= -\v 21 Xlakán lichiwakakgolh stilili likán xalak xkuxmún nak stilili likán nak xa lhakgat, maklakaskinkgolh takgon'xni xaspupuku, laki chuna lan natawakaj nak lhakgat. wa xlakata ni nataxkut'taktay xkuxmún talhakgán. chuna tlawakalh la Puchiná xlimapekgsinit Moisés. ->>>>>>> f99b3927bea3624650e369702b8fdcd9913aa734 +\v 21 Xlakán lichiwakakgolh stilili likán xalak xkuxmún nak stilili likán nak xa lhakgat, maklakaskinkgolh takgon'xni xaspupuku, laki chuna lan natawakaj nak lhakgat. wa xlakata ni nataxkut'taktay xkuxmún talhakgán. chuna tlawakalh la Puchiná xlimapekgsinit Moisés. \ No newline at end of file diff --git a/39/22.txt b/39/22.txt index 5b2702c4..37cca50f 100644 --- a/39/22.txt +++ b/39/22.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 22 Bezalel tlawa xkgetawkat klhakgat palijni xasmantajwa, xstaskujut chatúm tsapana. \v 23 Stitlili Klhukun nak xitat. Xtatsapanit tani klhukun laki pi ni nataxtita. \v 24 Nak xapakgalhu tani xtakgapsnit, tlawakgolh granadas xa spupuku, smantajwa, tasiw xa spinini chu lhakgat xa tsatata. -======= -\v 22 Bezaleel tlawa xkgetawkat klhakgat palijni xasmantajwa, xstaskujut chatúm tsapaná. \v 23 Stitlili Klhukun nak x'itat. Xtatsapanit tani klhukun laki pi ni nataxtita. \v 24 Nak xapakgalhu tani xtakgapsnit, tlawakgolh granadas xa spupuku, smantajwa, tasiw xa spinini chu lhakgat xa tsatata. ->>>>>>> f99b3927bea3624650e369702b8fdcd9913aa734 +\v 22 Bezaleel tlawa xkgetawkat klhakgat palijni xasmantajwa, xstaskujut chatúm tsapaná. \v 23 Stitlili Klhukun nak x'itat. Xtatsapanit tani klhukun laki pi ni nataxtita. \v 24 Nak xapakgalhu tani xtakgapsnit, tlawakgolh granadas xa spupuku, smantajwa, tasiw xa spinini chu lhakgat xa tsatata. \ No newline at end of file diff --git a/39/36.txt b/39/36.txt index ec4bb464..9f27aef7 100644 --- a/39/36.txt +++ b/39/36.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 36 Xlakán liminkgolh mesa, chu kaxtilanchaw tu lilakapastajkan Puchiná, \v 37 pumakgskgo xa oro chu akgstitum yaj tani pasakgoy, xtapaks tu tatamaklakaskín chu aceite tu lipasakgoy, \v 38 Pulakgatakilhputan xa oro, aceite tu liaktlawanankan chu muksu limajinin, litalakgatlapan nak malakcha xla akgstilhakgat chiki, \v 39 pulakgtakilhputan xaspinini likán xtapaks xpulhkuyat xaspinini likán chu xtalyaw, chu tu tatamaklakaskín chu xkgaxi xatlanka xtapaks xlaktawilh. -======= -\v 36 Xlakán liminkgolh mesa, xtapaks tu majlakaskinkgolh , chu kaxtilanchaw tu lilakapastajkan Puchiná, \v 37 pumakgskgo xa oro chu akgstitum yaj tani pasakgoy, xtapaks tu tatamaklakaskín chu aceite tu lipasakgoy, \v 38 Pulakgatakilhputan xa oro, aceite tu liaktlawanankan chu muksu limajinin, litalakgatlapan nak malakcha xla akgstilhakgat chiki, \v 39 pulakgtakilhputan xaspinini likán xtapaks xpulhkuyat xaspinini likán chu xtalyaw, chu tu tatamaklakaskín chu xkgaxi xatlanka xtapaks xlaktawilh. ->>>>>>> f99b3927bea3624650e369702b8fdcd9913aa734 +\v 36 Xlakán liminkgolh mesa, xtapaks tu majlakaskinkgolh , chu kaxtilanchaw tu lilakapastajkan Puchiná, \v 37 pumakgskgo xa oro chu akgstitum yaj tani pasakgoy, xtapaks tu tatamaklakaskín chu aceite tu lipasakgoy, \v 38 Pulakgatakilhputan xa oro, aceite tu liaktlawanankan chu muksu limajinin, litalakgatlapan nak malakcha xla akgstilhakgat chiki, \v 39 pulakgtakilhputan xaspinini likán xtapaks xpulhkuyat xaspinini likán chu xtalyaw, chu tu tatamaklakaskín chu xkgaxi xatlanka xtapaks xlaktawilh. \ No newline at end of file diff --git a/39/40.txt b/39/40.txt index 3c62208d..88537414 100644 --- a/39/40.txt +++ b/39/40.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 40 Xlakán liminkgolh lilakgatlapan xalak kilhtin xtapaks xatalyaw chu xlaktey, chu lilakgatlapan tani laktanukan, xtasiw chu takinkalhpitni laki pi nachi'kan lhakgat, chu xlipaks tu tamaklakaskín ktaskujut nak akgstilhakgat chiki, chiki xla tamakxtumit. \v 41 Xlakán liminkgolh lhakgat xatatsapa tu namaklakaskinkán nak xakasantujlani, xasanto lhakgat xla Aarón palij chu xkamán, laki pi xlakán na skujkgoy la palijni. -======= -\v 40 Xlakán liminkgolh lilakgatlapan xalak kilhtin xtapaks xatalyaw chu xlaktey, chu lilakgatlapan tani laktanukan, xtasiw chu takinkalhpitni laki pi nachi'kan lhakgat, chu xlipaks tu tamaklakaskín ktaskujut nak akgstilhakgat chiki, chiki xla tamakxtumit. \v 41 Xlakán liminkgolh lhakgat xatatsapa tu namaklakaskinkán nak xakasantujlani, xasanto lhakgat xla Aarón palijni chu xkamán, laki pi xlakán na skujkgoy la palijni. ->>>>>>> f99b3927bea3624650e369702b8fdcd9913aa734 +\v 40 Xlakán liminkgolh lilakgatlapan xalak kilhtin xtapaks xatalyaw chu xlaktey, chu lilakgatlapan tani laktanukan, xtasiw chu takinkalhpitni laki pi nachi'kan lhakgat, chu xlipaks tu tamaklakaskín ktaskujut nak akgstilhakgat chiki, chiki xla tamakxtumit. \v 41 Xlakán liminkgolh lhakgat xatatsapa tu namaklakaskinkán nak xakasantujlani, xasanto lhakgat xla Aarón palijni chu xkamán, laki pi xlakán na skujkgoy la palijni. \ No newline at end of file diff --git a/39/42.txt b/39/42.txt index 69167441..8db7878a 100644 --- a/39/42.txt +++ b/39/42.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 42 Chuná ama lakchixkuwin xalak Israel tlawakgolh putum taskujut chuna la Puchiná xlimapekgsinit Moisés. \v 43 Moisés ukxilhi putum ama taskujut, chu, kaukxilhitit, xlakan xtatlawanit. chuná la Puchiná xlimapekgsinit, chuná xlakán tlawakgolh. alistalh Moisés kasikulnatlawa. -======= -\v 42 Chuná ama lakchixkuwin xalak Israel tlawakgolh putum taskujut chuna la Puchiná xlimapekgsinit Moisés. \v 43 Moisés ukxilhi putum ama taskujut, chu, kaukxilhtit, xlakan xtatlawanit. chuná la Puchiná xlimapekgsinit, chuná xlakán tlawakgolh. alistalh Moisés kasikulnatlawa. ->>>>>>> f99b3927bea3624650e369702b8fdcd9913aa734 +\v 42 Chuná ama lakchixkuwin xalak Israel tlawakgolh putum taskujut chuna la Puchiná xlimapekgsinit Moisés. \v 43 Moisés ukxilhi putum ama taskujut, chu, kaukxilhtit, xlakan xtatlawanit. chuná la Puchiná xlimapekgsinit, chuná xlakán tlawakgolh. alistalh Moisés kasikulnatlawa. \ No newline at end of file diff --git a/40/24.txt b/40/24.txt index cb4efaec..78a37057 100644 --- a/40/24.txt +++ b/40/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 Xla natamaknulh xputawilh cera nak xpulakni chiki niku xtatastojkan Puchina, xkalhpatu putawilh, nak xpakgalhu chiki niku xtatastojkan Puchina. \v 25 Kamapasilh kcera xlakatin Puchina, chuna la Puchina xlimapakgsinit. -======= -\v 24 Xla natamaknulh xputawilh cera nak xpulakni chiki niku xtatastojkan Puchina, xkalhpatu putawilh, nak xpakgalhu chiki niku xtatastojkan Puchina. \v 25 Kamapasilh pumakgskgo xlakatin Puchina, chuna la Puchina xlimapakgsinit. ->>>>>>> b7ad1dd25c433ca2d4f28cd00c5e63a286a2b109 +\v 24 Xla natamaknulh xputawilh cera nak xpulakni chiki niku xtatastojkan Puchina, xkalhpatu putawilh, nak xpakgalhu chiki niku xtatastojkan Puchina. \v 25 Kamapasilh pumakgskgo xlakatin Puchina, chuna la Puchina xlimapakgsinit. \ No newline at end of file