fixmerge

0c4535cb · nanahira · f93cab95 · 0c4535cb
Commit 0c4535cb authored Jun 08, 2019 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

locales/en-US/strings.conf locales/en-US/strings.conf +0 -4

No files found.
--- a/locales/en-US/strings.conf
+++ b/locales/en-US/strings.conf
@@ -985,8 +985,4 @@
 !setname 0x12c Tenyi
 !setname 0x12d Simorgh
 !setname 0x12e Fortune Fairy
-<<<<<<< HEAD
 !setname 0x12f Battlewasp
-=======
-!setname 0x12f Battlewasp
->>>>>>> 8d0779c4e1908aee77270332c849a1305a5f9637