修改

ipip/config.yaml

@@ -1,7 +1,5 @@
-<<<<<<< HEAD
 mode: tcp
 port: 9876
-
 # 本地应用服务配置
 dbtype: all
 update_interval: 3600
@@ -9,25 +7,7 @@ ip:
     path: 'ipip.ipdb'
     url: 'https://file.weile.com/dict/ipip.ipdb'
     current_version: ''
-
 phone:
     path: 'phonearea.txt'
     url: 'https://file.weile.com/dict/phonearea.txt'
     current_version: ''
-=======
-mode: tcp
-port: 9876
-
-# 本地应用服务配置
-dbtype: all
-update_interval: 3600
-ip:
-    path: 'ipip.ipdb'
-    url: 'https://file.weile.com/dict/ipip.ipdb'
-    current_version: ''
-
-phone:
-    path: 'phonearea.txt'
-    url: 'https://file.weile.com/dict/phonearea.txt'
-    current_version: ''
->>>>>>> 9a505923f713918e95448779a35e95dcbd42165e