nmbd

ae4a045d · Tachibana · 76f3d813 · 253e6ae9 · ae4a045d
Commit ae4a045d authored May 23, 2021 by Tachibana
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

expansions/strings.conf expansions/strings.conf +4 -0

No files found.
--- a/expansions/strings.conf
+++ b/expansions/strings.conf
@@ -759,6 +759,10 @@
 #我永远喜欢零衣 1395370094 576 0x360-0x36f

 #竹子 1252425371 600 0xb00-0xb0f
+<<<<<<< HEAD
+=======
+!setname 0x6b02 空中连接
+>>>>>>> 253e6ae9a3ff5881c8f1c826f307da667760e9f7

 #LaiBill 529508379 601 0xb20-0xb2f
 !setname 0xab20 幻想曲