DCS-Mirror
/
erwinmast_nan-x-teochi_mrk_text_udb
mirror of https://git.door43.org/erwinmast/nan-x-teochi_mrk_text_udb
1
0
Fork 0
Files Issues Releases Wiki Activity See in Reader

Wed Feb 22 2017 14:56:00 GMT+0800 (Malay Peninsula Standard Time)

This commit is contained in:
james 2017-02-22 14:56:01 +08:00
parent 748b6f7a64
commit cffd5be848
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
01/01.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\c 1 \v 1 Cia thau hue-ai keng ce, Yasou, Shang Ti-ai kia. \v 2 Jien sia diok to Yesaya-ai keng ce : "Thoi, Shang Ti ham wa-ai phai nang soi than Yasou, I ai pun Yasou lou; \v 3 U nang-an sia to soi to sua tio : Muek pien lou pun Shang Ti, mek tit low pun Yasou",
=======
\c 1 \v 1 \v 2 \v 3
>>>>>>> 6248a76edf129445e938b98760e571f2f5da129e
\c 1 \v 1 \v 2 \v 3