恢复之前的定时任务配置取消不走综合服务的问题；

去掉英文国际化的合并记录
2019-05-05 11:02:11 +08:00
parent 148c18e943
commit 1060a5f85e
4 changed files with 4 additions and 5 deletions
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1515,7 +1515,6 @@ src_ip_pattern=Client IP Pattern
 dest_ip_pattern=Server IP Pattern
 src_port_pattern=Client Port Pattern
 dest_port_pattern=Server Port Pattern
-<<<<<<< develop_20190508_branch
 url_group_configuration=URL Group Configuration
 dns_keyword_group_configuration=DNS Keyword Group Configuration
 app_ip_correlation=APP IP Correlation