Fri Jul 19 2024 15:31:18 GMT-0400 (hora de Bolivia)

This commit is contained in:
wendyc 2024-07-19 15:31:18 -04:00
parent 38fe8f88a6
commit 352bbb478f
3 changed files with 3 additions and 15 deletions

View File

@ -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
\c 27 \v 1 \v 2 Conflict Parsing Error

View File

@ -1,5 +1 @@
<<<<<<< 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 \v 4 Conflict Parsing Error

View File

@ -1,5 +1 @@
<<<<<<< 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 \v 6 Conflict Parsing Error