wendyc
/
neq_mrk_text_reg
1
0
Fork 0
Files Issues Pull Requests Releases Wiki Activity See in Reader

Wed Jan 26 2022 16:33:34 GMT-0400 (Paraguay Standard Time)

This commit is contained in:
wendyc 2022-01-26 16:33:34 -04:00
parent 53bc7b304d
commit 9df46a41c5
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
06/42.txt
View File

@ -1,6 +1 @@
<<<<<<< HEAD \v 42 Nitukëye ojts kujxë kyäytyë. \v 43 Tyumpë tëjk tkonmuktë tsäpka'aky kay tyuk, ujts mäkmätsk kä'äk, më'te akxy. \v 44 Wäi'itë nimuwoxk mil maty ojts tsa'pka'ajky tkaytyë
\v 42 Nitukëye ojts kujxë kyäytyë. \v 43 Tyumpë tëjk tkonmuktë tsäpka'aky kay tyuk, ujts mäkmätsk kä'äk, më'te akxy. \v 44 Wäi'itë nimuwoxk mil maty ojts tsa'pka'ajky tkaytyë
=======
\v 42 Nitukëye ojts kujxë kyäytyë. \v 43 Tyumpë tëjk tkonmuktë tsäpka'aky kay tyuk, ujts mäkmatokä'äk, më'te akxy.
\v 44 Wai'itë nimuwoxk mil mat: ojts tsa'pka'ajky tkaytyë
>>>>>>> 9eec394c4984bc028022ebabd4e50b09e4054663