From b513004ff6676971a4beeb0d5f4af52ea9f5d22b Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 20 Jun 2018 17:33:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89git=E7=9A=84=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 6 +----- src/main/resources/messages/message_ru.properties | 6 +----- src/main/resources/messages/message_zh_CN.properties | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 5d3a33354..ac741db94 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -658,14 +658,10 @@ data_tunnel=data tunnel contrl_message=contrl message data_message=data message user_name=user name -<<<<<<< HEAD #===========log end ============= #===========policy_group_manage start ============= all_types=all types group_type=group type group_name=group name policy_group_manage=strateagy grouping management -#===========policy_group_manage end ============= -======= -#===========log end ============= ->>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git +#===========policy_group_manage end ============= \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index a346bcb77..5a038eb3b 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -484,14 +484,10 @@ data_tunnel=data tunnel contrl_message=contrl message data_message=data message user_name=user name -<<<<<<< HEAD #===========log end ============= #===========policy_group_manage start ============= all_types=all types group_type=group type group_name=group name policy_group_manage=strateagy grouping management -#===========policy_group_manage end ============= -======= -#===========log end ============= ->>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git +#===========policy_group_manage end ============= \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 7ada2db6b..595cca3f3 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -693,14 +693,10 @@ data_tunnel=\u6570\u636E\u901A\u9053 contrl_message=\u63A7\u5236\u62A5\u6587 data_message=\u6570\u636E\u62A5\u6587 user_name=\u7528\u6237\u540D\u79F0 -<<<<<<< HEAD #===========log end ============= #===========policy_group_manage start ============= all_types=\u6240\u6709\u7C7B\u578B group_type=\u5206\u7EC4\u7C7B\u578B group_name=\u5206\u7EC4\u540D\u79F0 policy_group_manage=\u7B56\u7565\u5206\u7EC4\u7BA1\u7406 -#===========policy_group_manage end ============= -======= -#===========log end ============= ->>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git +#===========policy_group_manage end ============= \ No newline at end of file