diff --git a/26/19.txt b/26/19.txt index cb7cae13..672bbf84 100644 --- a/26/19.txt +++ b/26/19.txt @@ -1,5 +1,3 @@ -<<<<<<< HEAD -\v 19 \v 20 \v 21 19 -======= + \v 19 Natlawayatit tipuxam xputay plata tu natawila nakx tapin akgpuxam lhtakala. Xli tawilat akgtuy putay kxtapin xli maktum lhtakala wa tu na chaxa chu nachuna aktuy putay xtapin makgapitsin lhtakala xla yakgtuy xpujaxni. \v 20 Xla xlilakatuy xtapan xchik Dios xpakxtu, akgpuxam lhtakala natlawayatit \v 21 chu tipuxam xputay xla plata. Aktuy xlitawilat xputay nakxtampin nakxli maktum lhtakala, aktuy xputay nak xli maktuy lhtakala, y chuna na yantilha. ->>>>>>> 411b1635b26a1e2e7694374c290e5d61cd31f3be + diff --git a/27/01.txt b/27/01.txt index 8ffc57db..a1e240ae 100644 --- a/27/01.txt +++ b/27/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD \c 27 \v 1 Mi litlhawat pulagtakilhputan xla matan kajkiwi, yakgkitsis makxpan xli lhman chu yakgkitsis makxpan xli titlanka. Pulagtakilhputan xlakaskinka statijua na wan xli yakxtutu makxpan xli tlanka. \v 2 Chi xyakgtatai kgansastun xtachuna xyakgalokgot wakax mi liltlhawat. Chi yakgalokgut yakgtum na tawankgo pulagtakilhputan, chu wix na litsokga bronce. -======= -\c 27 \v 1 \v 2 1 Mi litlhawat pulagtakilhputan xla matan kajkiwi, yakgkitsis makxpan xli lhman chu yakgkitsis makxpan xli titlanka. Pulagtakilhputan xlakaskinka statijua na wan xli yakxtutu makxpan xli tlanka. 2 Chi xyakgtatai kgansastun xtachuna xyakgalokgot wakax mi liltlhawat. Chi yakgalokgot yakgtum na tawankgo pulagtakilhputan, chu wix na kamaukaniya bronce. ->>>>>>> 38503a1d4b178ee7fea447ccf78fbb890c3be7cc diff --git a/27/03.txt b/27/03.txt index 176c5402..b02b5d44 100644 --- a/27/03.txt +++ b/27/03.txt @@ -1,5 +1,2 @@ -<<<<<<< HEAD -\v 3 Mi litlhawat wantw na liyan pulagtakilhputan : yakgtum tlhamanklh xla -------- ,chu malakgaspitni, xapulhman puway, lilaklhtukun xla liguay chu pulhkuyat. Militlhawat pokgtu yuma tu na lakmakaskina xli bronce. \v 4 Mi litlahuat xrejiya pulagtakilhputan, yakgtum reja xla bronce. Katlhawa stilili likan xla bronce yakgtum yakgtum la wi xkansastun. -======= -\v 3 \v 4 3 Mi litlhawat wantw na liyan pulagtakilhputan : yakgtum tlhamanklh xla lhkaka, chu malakgaspitni, xapulhman puway, lilaklhtukun xla liguay chu pulhkuyhat. Paks yuma tu kuanin xa bronce na litlhawaya.4 Mi litlahuat pulhkuyat pulagtakilhputan, yakgtum sala likan xla bronce. Katlhawa stilili likan xla bronce xla yakgtunu lakatati xkgansastun. ->>>>>>> 38503a1d4b178ee7fea447ccf78fbb890c3be7cc +\v 3 Mi litlhawat wantw na liyan pulagtakilhputan : yakgtum tlhamanklh xla lhkaka, chu malakgaspitni, xapulhman puway, lilaklhtukun xla liguay chu pulhkuyhat. Paks yuma tu kuanin xa bronce na litlhawaya. \v 4 Mi litlahuat pulhkuyat pulagtakilhputan, yakgtum sala likan xla bronce. Katlhawa stilili likan xla bronce xla yakgtunu lakatati xkgansastun. + diff --git a/27/05.txt b/27/05.txt index 9ce412ea..2cee3484 100644 --- a/27/05.txt +++ b/27/05.txt @@ -1,5 +1,2 @@ -<<<<<<< HEAD -\v 5 Mi liwalit xreja xlakgaju xkilhpan pulagtakilhputan, la xpuyatat antalakgaju. \v 6 Militlhawat xatisinu kiwi xla pulagtakilhputan, xatsastinu kiwi matan kajkiwi, chu mi limaktlhawat con bronce-----. -======= -\v 5 \v 6 5 Mi liwalit pulhkuyat xlakgaju xkilhpan pulagtakilhputan, lak xyatata antanak xtantun.6 Militlhawat tsatsu kiwi xla pulagtakilhputan, xatsatsu kiwi matan kajkiwi, chu na lilimaktlhawaya bronce. ->>>>>>> 38503a1d4b178ee7fea447ccf78fbb890c3be7cc +\v 5 Mi liwalit xreja xlakgaju xkilhpan pulagtakilhputan, la xpuyatat antalakgaju. \v 6 Militlhawat xatisinu kiwi xla pulagtakilhputan, xatsastinu kiwi matan kajkiwi, chu mi limaktlhawat con bronce. + diff --git a/27/07.txt b/27/07.txt index 770e27ce..f6c5c27b 100644 --- a/27/07.txt +++ b/27/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Chi sastinu kiwi mi limanut nak stilili likan, chu sastinu kiwi yanta xli tawilat nak xyaktwy paxtun pulagtakilhputan, na ma na chaxkan---- \v 8 Pulakwankala mi litlhawat pulagtakilhputan, mak tabla. Chuna mi litlhawat la masinikanti nak sipi. -======= -\v 7 \v 8 7 Chi tsastu kiwi mi limanut nak stilili likan, chu tsastu kiwi yanta xli tawilat nak xyaktwy paxtun pulagtakilhputan, nama na lichaxnankan.8 Pulakwankala mi litlhawat pulagtakilhputan, mak tabla. Chuna mi litlhawat la masinikanti nak kasipijni. ->>>>>>> 38503a1d4b178ee7fea447ccf78fbb890c3be7cc +\v 7 Chi tsastu kiwi mi limanut nak stilili likan, chu tsastu kiwi yanta xli tawilat nak xyaktwy paxtun pulagtakilhputan, nama na lichaxnankan. \v 8 Pulakwankala mi litlhawat pulagtakilhputan, mak tabla. Chuna mi litlhawat la masinikanti nak kasipijni. \ No newline at end of file diff --git a/27/09.txt b/27/09.txt index 9eb81852..b09d583c 100644 --- a/27/09.txt +++ b/27/09.txt @@ -1,5 +1,2 @@ -<<<<<<< HEAD -\v 9 Mi litlawat yaktum xkilhtin xla xchik Dios. Xlitawilat lilakgatlhapan nak xpaxtun xlakgaju xkilhti, xlilakgatlhapan lino fino----- xli yakgkitsispuxam makxpan xli lhman. \v 10 Chi lilakgatlhapan xli kgalhit taliyau, chu xakgpuxam putay xla bronce----.Na xli kgalhit kgalhakgxtokge xatachin nak taliyaw, na chuna xa lhman plata. -======= -\v 9 \v 10 9 Mi litlawat yaktum xkilhtin xla xchik Dios. Xlitawilat lilakgatlhapan nak xpaxtun xlakgaju xkilhtin, xlilakgatlhapan lino tu lu xatlhan xli yakgkitsispuxam makxpan xli lhman. 10 Chi lilakgatlhapan xli kgalhit taliyau, chu xakgpuxam putay xla bronce.Na xli kgalhit kgalhakgxtokge xatachin nak taliyaw, na chuna xa lhman plata. +\v 9 Mi litlawat yaktum xkilhtin xla xchik Dios. Xlitawilat lilakgatlhapan nak xpaxtun xlakgaju xkilhtin, xlilakgatlhapan lino tu lu xatlhan xli yakgkitsispuxam makxpan xli lhman.\v 10 Chi lilakgatlhapan xli kgalhit taliyau, chu xakgpuxam putay xla bronce.Na xli kgalhit kgalhakgxtokge xatachin nak taliyaw, na chuna xa lhman plata. >>>>>>> 38503a1d4b178ee7fea447ccf78fbb890c3be7cc diff --git a/27/11.txt b/27/11.txt index 5bf11dd5..1c1193ee 100644 --- a/27/11.txt +++ b/27/11.txt @@ -1,5 +1,2 @@ -<<<<<<< HEAD -\v 11 Na chuna nak xpaxtun xpekegxtu, xli tawilat lilakgatlhapan tu yakgkitsispuxam makxpan xlilhman chu yakgpuxam taliyaw , yakgpuxam xputay bronce----, kgalakgxtokge xatachin nak taliyau, chulhman plata-------. \v 12 Xli lhman kgepun xpaxtun anta ni tzankgay chichini xli tawilat yakgtum lilakgtlhapan wantu tipuxumakaw makxpan xli lhman. Xlitawi yakgkaw taliyau chubyakgkaw putay. \v 13 Xkgepun na tipuxamakaw makxpan xli lhman xlilat nak xpaxtun xlipulhni chichini. -======= -\v 11 \v 12 \v 13 11 Na chuna nak xpaxtun xpekegxtu, xli tawilat lilakgatlhapan tu yakgkitsispuxam makxpan xlilhman chu yakgpuxam taliyaw , yakgpuxam xputay bronce, kgalakgxtokge xatachin nak taliyau, chu lhman plata.12 Xli lhman kgepun xpaxtun anta ni tzankgay chichini xli tawilat yakgtum lilakgtlhapan wantu tipuxumakaw makxpan xli lhman. Xlitawi yakgkaw taliyau chu yakgkaw putay.13 Xkgepun na tipuxamakaw makxpan xli lhman xlilat nak xpaxtun xlipulhni chichini. ->>>>>>> 38503a1d4b178ee7fea447ccf78fbb890c3be7cc +\v 11 Na chuna nak xpaxtun xpekegxtu, xli tawilat lilakgatlhapan tu yakgkitsispuxam makxpan xlilhman chu yakgpuxam taliyaw , yakgpuxam xputay bronce, kgalakgxtokge xatachin nak taliyau, chu lhman plata.\v 12 Xli lhman kgepun xpaxtun anta ni tzankgay chichini xli tawilat yakgtum lilakgtlhapan wantu tipuxumakaw makxpan xli lhman. Xlitawi yakgkaw taliyau chu yakgkaw putay. \v 13 Xkgepun na tipuxamakaw makxpan xli lhman xlilat nak xpaxtun xlipulhni chichini. + diff --git a/27/14.txt b/27/14.txt index 7511dd4e..bf11cd2c 100644 --- a/27/14.txt +++ b/27/14.txt @@ -1,5 +1,2 @@ -<<<<<<< HEAD -\v 14 Xlilakgatlhapan yakgtum xkilhpan xlilaktanun yakgkukitsis mahxpan xli lhman xlilat. Xli kgalhit yakgtutu taliyau con----yakgtutu putay. \v 15 Yakgtum xpaxtun na xlikgalhit lilakgatlhapan kukitsis xli lhman. Xli kgalhit yakgtutu taliyau chu yakgtutu putay. \v 16 Xlax malkcha kgepun xli kgalhit lilakgatlhapan akguxum makxpan xli lhman. Xlilakgatlhapan wa na litlhawakan wantu spupuku, mandajua chu spinini chu lino fino------xatalakguilekgxni , xtaskujni wanti lakgtspanan. Xlikalhit yakgtati taliyau chu yakgtati putay. -======= -\v 14 \v 15 \v 16 14 Xlilakgatlhapan yakgtum xkilhpan xlilaktanun yakgkukitsis makxpan xli lhman xlilat. Xli kgalhit kgantutu taliyau tu xlikgalhit yakgtutu putay.15 Yakgtum xpaxtun na xlikgalhit lilakgatlhapan kukitsis makxpan xli lhman. Xli kgalhit yakgtutu taliyau chu yakgtutu putay.16 Xlax malkcha kgepun xli kgalhit lilakgatlhapan akguxum makxpan xli lhman. Xlilakgatlhapan wa na litlhawakan wantu spupuku, mandajua chu spinini chu lino tu lu xa tlan xa talakgawilekgxni, xtaskujni wanti lakgtspanan. Xlikalhit yakgtati taliyau chu yakgtati putay. ->>>>>>> 38503a1d4b178ee7fea447ccf78fbb890c3be7cc +\v 14 Xlilakgatlhapan yakgtum xkilhpan xlilaktanun yakgkukitsis mahxpan xli lhman xlilat. Xli kgalhit yakgtutu taliyau con----yakgtutu putay. \v 15 Yakgtum xpaxtun na xlikgalhit lilakgatlhapan kukitsis xli lhman. Xli kgalhit yakgtutu taliyau chu yakgtutu putay. \v 16 Xlax malkcha kgepun xli kgalhit lilakgatlhapan akguxum makxpan xli lhman. Xlilakgatlhapan wa na litlhawakan wantu spupuku, mandajua chu spinini chu lino fino xatalakguilekgxni , xtaskujni wanti lakgtspanan. Xlikalhit yakgtati taliyau chu yakgtati putay. + diff --git a/27/17.txt b/27/17.txt index e5340837..5c543728 100644 --- a/27/17.txt +++ b/27/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Pokgtu taliyau nak kgepun xli kgalhit lhman plata---,kgalakgxtokge plata--, chu putay bronce--. \v 18 Xli lhman kgepun kitsispuxam makxpan xlilhman xlilat, tipuxumakau makxpan xlilat xkgechu, chu litalhman yakgkitsis makxpan chu lilakgalthapan lino fino---- xatalakswitni la xli pokgtu xlilhman,chu xaputay bronce. \v 19 Pokgtu tu liyan xlitalakaskit nak xchiki Dios,chu pokgtu yakgkaw xatankalhpitni kiwi xla xchiki Dios chu xkgepun wa xlitalakaxlaw bronce--- xlilat. -======= -\v 17 \v 18 \v 19 17 Pokgtu taliyau nak kgepun xli kgalhit lhman plata, kgalakgxtokge plata, chu putay bronce.18 Xli lhman kgepun kitsispuxam makxpan xlilhman xlilat, tipuxumakau makxpan xlilat xtitlhanka, chu litalhman yakgkitsis makxpan chu lilakgalthapan lino fino xatalakswitni la xli pokgtu xlilhman,chu xaputay bronce.19 Pokgtu tu liyan xlitalakaskit nak xchiki Dios,chu pokgtu yakgkaw xatankalhpitni kiwi xla xchiki Dios chu xkgepun wa xlitalakaxlaw bronce xlilat. ->>>>>>> 38503a1d4b178ee7fea447ccf78fbb890c3be7cc +\v 17 Pokgtu taliyau nak kgepun xli kgalhit lhman plata,kgalakgxtokge plata, chu putay bronce. \v 18 Xli lhman kgepun kitsispuxam makxpan xlilhman xlilat, tipuxumakau makxpan xlilat xkgechu, chu litalhman yakgkitsis makxpan chu lilakgalthapan lino fino xatalakswitni la xli pokgtu xlilhman,chu xaputay bronce. \v 19 Pokgtu tu liyan xlitalakaskit nak xchiki Dios,chu pokgtu yakgkaw xatankalhpitni kiwi xla xchiki Dios chu xkgepun wa xlitalakaxlaw bronce xlilat. diff --git a/27/20.txt b/27/20.txt index f52501e3..cc25e702 100644 --- a/27/20.txt +++ b/27/20.txt @@ -1,5 +1,2 @@ -<<<<<<< HEAD -\v 20 Mi limapekgsit xkachikin Israel pi na lemenkgo xaceite oliva---,xa talakgxkgota, xla limakgskgo tu pekua tlan na lakgskgokgo . \v 21 Nak yakgtlhapan anta ni tamakgastokgkan, nak xkgepun lilakgtlhapan tu wi nak xlakatin xchiki Dios tu kgalhi pumakaki xla xlikana tachiwin, Aarón chu xkaman xlhi makgtakgalhat --- liakgskgoy xapasan nak xlakatin PUCHINA, la katsisni hasta--- punsisa. Yuma taskin lamapexsin xli taxtut--- tiwan la mimakgo xtalakgapasni xlak Isarel. -======= -\v 20 \v 21 20 Mi limapekgsit xkachikin Israel pi na limenkgo xaceite oliva xa talakgxkgota, xla limakgskgo pi titum na lakgskgokgo .21 Nak yakgtlhapan anta ni tamakgastokgkan, nak xkgepun lilakgtlhapan tu wi nak xlakatin xchiki Dios tu kgalhi pumakaki xla xlikana tachiwin, Aarón chu xkaman na wakxekgo pi tiwan xli pasat limakgskgot nak xliakatin PUCHINA, la tsuku siswan chu na kitsuku punsisa. Wa uma tu kaskiniman limapakgsina xli wanat xlitiwan la mekgoyacha mi lilakgapasni xlak xkachikin Isarel ->>>>>>> 38503a1d4b178ee7fea447ccf78fbb890c3be7cc +\v 20 Mi limapekgsit xkachikin Israel pi na lemenkgo xaceite oliva,xa talakgxkgota, xla limakgskgo tu pekua tlan na lakgskgokgo .\v 21 Nak yakgtlhapan anta ni tamakgastokgkan, nak xkgepun lilakgtlhapan tu wi nak xlakatin xchiki Dios tu kgalhi pumakaki xla xlikana tachiwin, Aarón chu xkaman xlhi makgtakgalhat liakgskgoy xapasan nak xlakatin PUCHINA, la katsisni hasta punsisa. Yuma taskin lamapexsin xli taxtut tiwan la mimakgo xtalakgapasni xlak Isarel. +