Sat Jul 20 2024 09:30:22 GMT-0400 (hora de Bolivia)

This commit is contained in:
wendyc 2024-07-20 09:30:22 -04:00
parent f302f68cd8
commit 602a6cb6c1
6 changed files with 6 additions and 30 deletions

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\c 20 \v 1 Chiwinalh Puchiná putum uma tachiwín: \v 2 Akit Xla Puchiná mi Dios, ti tamakaxtún xtiyat Egipto, tani tachín xwilatit. \v 3 Ni mi li kgalhit amakgapitsin ti la'midios nak kilakatín.
=======
\c 20 \v 1 chiwinalh Puchiná putum uma tachiwín: \v 2 Akit Xla Puchiná mi Dios, ti tamakaxtún xtiyat Egipto, tani tachín xwilatit. \v 3 Ni mi li kgalhit amakgapitsin ti la'midios nak kilakatín.
>>>>>>> 9eeafe06feb5cf4799dd15f7203f427e8705d4ef
\c 20 \v 1 chiwinalh Puchiná putum uma tachiwín: \v 2 Akit Xla Puchiná mi Dios, ti tamakaxtún xtiyat Egipto, tani tachín xwilatit. \v 3 Ni mi li kgalhit amakgapitsin ti la'midios nak kilakatín.

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 4 Wixinan ni mi litlawatkan ni pala akgtúm tamakanitlaw pala na tasiyuy la tu wi talhman ka'kgapun, osu tu wi tutsu katiyatni, osu tu tajuma xtampún chuchut. \v 5 Wixinan ni mililakgta kilhhputatkan tamakanitlaw osu namaxkiyatit kakni, sampi Akit, wa Puchiná mi Dios, akit chatum Dios klakaskín xman akit nakilalakgtakilhputayaw. Akit ka'akgastakyaway xtalakgalhinkán xalakgmakgán, kaliminiy tapatín xkamán, xlikilhmaktutu chu xlikilhmaktati tastakat wa ti kisitsinikgoy. \v 6 Wampi Akit kmakgataxtiy talakaxlan tu xlikana akglhuwa mil ti Akit kimpaxkikgoy chu lakgachixkuwikgoy ki limapekgsín.
=======
\v 4 Wixinan ni mi litlawatkan ni pala akgtúm tamakanitlaw pala na tasiyuy la tu wi talhman ka'kgapun, osu tu wi tutsu katiyatni, osu tu tajuma xtampún chuchut. \v 5 ni mililakgta kilhhputatkan tamakanitlaw osu namaxkiyatit kakni, sampi Akit, wa Puchiná mi Dios, akit chatum Dios klakaskín xman akit nakilalakgtakilhputayaw. Akit ka'akgastakyaway xtalakgalhinkán xalakgmakgán, kaliminiy tapatín xkamán, xlikilhmaktutu chu xlikilhmaktati tastakat wa ti kisitsinikgoy. \v 6 Wampi Akit kmakgataxtiy talakaxlan tu xlikana akglhuwa mil ti Akit kimpaxkikgoy chu lakgachixkuwikgoy ki limapekgsín.
>>>>>>> 9eeafe06feb5cf4799dd15f7203f427e8705d4ef
\v 4 Wixinan ni mi litlawatkan ni pala akgtúm tamakanitlaw pala na tasiyuy la tu wi talhman ka'kgapun, osu tu wi tutsu katiyatni, osu tu tajuma xtampún chuchut. \v 5 ni mililakgta kilhhputatkan tamakanitlaw osu namaxkiyatit kakni, sampi Akit, wa Puchiná mi Dios, akit chatum Dios klakaskín xman akit nakilalakgtakilhputayaw. Akit ka'akgastakyaway xtalakgalhinkán xalakgmakgán, kaliminiy tapatín xkamán, xlikilhmaktutu chu xlikilhmaktati tastakat wa ti kisitsinikgoy. \v 6 Wampi Akit kmakgataxtiy talakaxlan tu xlikana akglhuwa mil ti Akit kimpaxkikgoy chu lakgachixkuwikgoy ki limapekgsín.

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 19 \v 20 \v 21 Conflict Parsing Error
=======
\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.
>>>>>>> 9eeafe06feb5cf4799dd15f7203f427e8705d4ef
\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.

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\c 27 \v 1 \v 2 Conflict Parsing Error
=======
\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.
>>>>>>> 9eeafe06feb5cf4799dd15f7203f427e8705d4ef
\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.

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 3 \v 4 Conflict Parsing Error
=======
\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.
>>>>>>> 9eeafe06feb5cf4799dd15f7203f427e8705d4ef
\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.

View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 7 \v 8 Conflict Parsing Error
=======
\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.
>>>>>>> 9eeafe06feb5cf4799dd15f7203f427e8705d4ef
\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.