解决冲突更新代码

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