解决冲突更新代码

2018-03-13 13:04:36 +08:00
parent 7dd02b090f
commit b2d75cfb43
2 changed files with 2 additions and 2 deletions
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -270,4 +270,4 @@ case_insensitive_nohex=case insensitive and no hex
 case_sensitive_nohex=case sensitive and no hex
 area_effect_id=area effect id
 ip_type=ip type
-#==========guankongbaimingdan end=====================
+#==========guankongbaimingdan end=====================
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -270,4 +270,4 @@ case_insensitive_nohex=case insensitive and no hex
 case_sensitive_nohex=case sensitive and no hex
 area_effect_id=area effect id
 ip_type=ip type
-#==========guankongbaimingdan end=====================
+#==========guankongbaimingdan end=====================