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

去掉git的冲突标记

Browse Source
This commit is contained in:
wangxin
2018-06-20 17:33:28 +08:00
parent 20e38eb0e8
commit b513004ff6
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -658,14 +658,10 @@ data_tunnel=data tunnel
contrl_message=contrl message contrl_message=contrl message
data_message=data message data_message=data message
user_name=user name user_name=user name
<<<<<<< HEAD
#===========log end ============= #===========log end =============
#===========policy_group_manage start ============= #===========policy_group_manage start =============
all_types=all types all_types=all types
group_type=group type group_type=group type
group_name=group name group_name=group name
policy_group_manage=strateagy grouping management policy_group_manage=strateagy grouping management
#===========policy_group_manage end ============= #===========policy_group_manage end =============
=======
#===========log end =============
>>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git

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

@@ -484,14 +484,10 @@ data_tunnel=data tunnel
contrl_message=contrl message contrl_message=contrl message
data_message=data message data_message=data message
user_name=user name user_name=user name
<<<<<<< HEAD
#===========log end ============= #===========log end =============
#===========policy_group_manage start ============= #===========policy_group_manage start =============
all_types=all types all_types=all types
group_type=group type group_type=group type
group_name=group name group_name=group name
policy_group_manage=strateagy grouping management policy_group_manage=strateagy grouping management
#===========policy_group_manage end ============= #===========policy_group_manage end =============
=======
#===========log end =============
>>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git

6
src/main/resources/messages/message_zh_CN.properties
View File

@@ -693,14 +693,10 @@ data_tunnel=\u6570\u636E\u901A\u9053
contrl_message=\u63A7\u5236\u62A5\u6587 contrl_message=\u63A7\u5236\u62A5\u6587
data_message=\u6570\u636E\u62A5\u6587 data_message=\u6570\u636E\u62A5\u6587
user_name=\u7528\u6237\u540D\u79F0 user_name=\u7528\u6237\u540D\u79F0
<<<<<<< HEAD
#===========log end ============= #===========log end =============
#===========policy_group_manage start ============= #===========policy_group_manage start =============
all_types=\u6240\u6709\u7C7B\u578B all_types=\u6240\u6709\u7C7B\u578B
group_type=\u5206\u7EC4\u7C7B\u578B group_type=\u5206\u7EC4\u7C7B\u578B
group_name=\u5206\u7EC4\u540D\u79F0 group_name=\u5206\u7EC4\u540D\u79F0
policy_group_manage=\u7B56\u7565\u5206\u7EC4\u7BA1\u7406 policy_group_manage=\u7B56\u7565\u5206\u7EC4\u7BA1\u7406
#===========policy_group_manage end ============= #===========policy_group_manage end =============
=======
#===========log end =============
>>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git