gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突 更新代码

Browse Source
This commit is contained in:
zhangshilin
2018-03-13 13:08:32 +08:00
parent 382e791e3b
commit 8451ff68b6
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/messages/message_en.properties
View File

@@ -1,3 +1,4 @@
#menu and button info #menu and button info
funMenu=function menu funMenu=function menu
sysManage=system management sysManage=system management
@@ -270,4 +271,4 @@ case_insensitive_nohex=case insensitive and no hex
case_sensitive_nohex=case sensitive and no hex case_sensitive_nohex=case sensitive and no hex
area_effect_id=area effect id area_effect_id=area effect id
ip_type=ip type ip_type=ip type
#==========guankongbaimingdan end===================== #==========guankongbaimingdan end=====================

3
src/main/resources/messages/message_ru.properties
View File

@@ -1,3 +1,4 @@
#menu and button info #menu and button info
funMenu=function menu funMenu=function menu
sysManage=system management sysManage=system management
@@ -270,4 +271,4 @@ case_insensitive_nohex=case insensitive and no hex
case_sensitive_nohex=case sensitive and no hex case_sensitive_nohex=case sensitive and no hex
area_effect_id=area effect id area_effect_id=area effect id
ip_type=ip type ip_type=ip type
#==========guankongbaimingdan end===================== #==========guankongbaimingdan end=====================