修改配置文件冲突

@@ -7,13 +7,8 @@
         <property name="yoho.search.service.env.webapphome" defaultValue="/home/dev/yoho-search-service/deploy" description="install path"/>
 
         <property name="java.logs.home" defaultValue="/Data/logs" description="日志打印路径"/>
-<<<<<<< HEAD
         <property name="search.es.cluster.name" defaultValue="yohosearch" description="" />
         <property name="search.es.servers" defaultValue="172.16.6.95:9300 " description="" />
-=======
-        <property name="search.es.cluster.name" defaultValue="yohosearch_test" description="" />
-        <property name="search.es.servers" defaultValue="192.168.102.209:9300" description="" />
->>>>>>> dev
         <property name="search.index.number_of_replicas" defaultValue="2" description="" />
         <property name="search.index.refresh_interval" defaultValue="1" description="" />
         <property name="search.index.translog.flush_threshold_ops" defaultValue="5000" description="" />

-#超时时间配置
+
 service.call.connectReqTimeout=10000
 service.call.socketTimeout=10000
 service.call.connectTimeout=10000

 datasources:
-<<<<<<< HEAD
    yhb_search_2016:
-=======
    ${jdbc.mysql.yhbsearch.datasources}:  
->>>>>>> dev
       servers:
         - ${jdbc.mysql.yhbsearch.master}
         - ${jdbc.mysql.yhbsearch.slave}