Skip to content

Y
ygopro-222DIY-cards
Commit dba0b131 authored by Tachibana's avatar Tachibana
Browse files
Options

nmbd

parent ae4a045d
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
expansions/strings.conf
View file @ dba0b131
......@@ -759,10 +759,7 @@
#我永远喜欢零衣 1395370094 576 0x360-0x36f
#竹子 1252425371 600 0xb00-0xb0f
<<<<<<< HEAD
=======
!setname 0x6b02 空中连接
>>>>>>> 253e6ae9a3ff5881c8f1c826f307da667760e9f7
#LaiBill 529508379 601 0xb20-0xb2f
!setname 0xab20 幻想曲
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment