去掉git的冲突标记

2018-06-20 17:33:28 +08:00
parent 20e38eb0e8
commit b513004ff6
3 changed files with 3 additions and 15 deletions
--- 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  =============