解决冲突更新代码

2018-03-13 13:08:32 +08:00
parent 382e791e3b
commit 8451ff68b6
2 changed files with 4 additions and 2 deletions
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1,3 +1,4 @@
+
 #menu and button info
 funMenu=function menu
 sysManage=system management
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1,3 +1,4 @@
+
 #menu and button info
 funMenu=function menu
 sysManage=system management