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

Tue Apr 10 2018 11:18:29 GMT-0400 (SA Western Standard Time)

This commit is contained in:
mitikiwostky 2018-04-10 11:18:30 -04:00
parent 8380995e0d
commit b6ad1ba223
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
03/10.txt
View File

@ -1,9 +0,0 @@
<<<<<<< HEAD
\v 12 \v 10 Te'ena ja po'otpë pu'ux ye'ekpëm ma'am epj xo'o a'ats na'atsë tukëyë xo'o ma'aty oy katëm ëpy y'ekj po'otjëkpë jats ye'ekj jë'ën yu'upe pe'ety. \v 11 Ets miits ixa'am nyeknepe'etpye nëë kexm jats mits winmayë'ëmpity pëns ëts xpamimpë ixokj, me'ekj më awxëewje Nike ets. Jats Nike ets xpaat etya jats kye'ekj pakone'et jë nikx nyekne'epetytyete Dios wya'ats po'onje kexm jats me'et jë'ën.
=======
<<<<<<< HEAD
\v 10 Te'ena ja po'otpë pu'ux ye'ekpëm ma'am epj xo'o a'ats. Na'atsë tukëyë xo'o ma'aty of katëm ëpy ye'ekj po'otjëkpë jats ye'ekj jë'ëen. yu'upe pe'ty. \v 11 Ëts miits ixa'am nyeknepe'etpye nëe kexm jats mits winmayë'ëmpity pëns ëts xpamimpë ixokj, me'ekj më awxëëwje niké ets jats niké ëts xpa'at etya jats kye'ekj pakone'et je nikx nyekne'epetytyete Dios wyats po'onjen kexm jats me'et jë'ën.\v 12 Ja ya'akaptwats ja'm ja tkejëm'ë jats winka'apkext pux ma'am të na'axyëkjyuum pity jats naynya ko'onjekj mo'okj ma'am kyo'onjëkjtakj ja'ts tyëkjtoyty penx kiepy jëën jopy ma'aty nijuna kaokpë.
=======
\v 10 Te'ena ja po'otpë pu'ux ye'ekpëm ma'am epj xo'o a'ats na'atsë tukëyë xo'o ma'aty oy katëm ëpy y'ekj po'otjëkpë jats ye'ekj jë'ën yu'upe pe'ety. \v 11 Ets miits ixa'am nyeknepe'etpye nëë kexm jats mits winmayë'ëmpity pëns ëts xpamimpë ixokj, me'ekj më awxëewje Nike ets. Jats Nike ets xpaat etya jats kye'ekj pakone'et jë nikx nyekne'epetytyete Dios wya'ats po'onje kexm jats me'et jë'ën. \v 12 Ja ya'akaptwats ja'm ja tkej'ë'më jats winka'apkext pux m
>>>>>>> branch 'master' of git@git.door43.org:mitikiwostky/neq_mat_text_reg.git
>>>>>>> eb56e3d6e6f9e26037b143ac1f024680421a06b2

2
manifest.json
View File

@ -78,7 +78,7 @@
"04-12",
"04-14",
"04-17",
"03-10",
"05-title",
"05-05",
"05-09",
"05-11"