diff --git a/vue.config.js b/vue.config.js
index 39a6a43..67d42b9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -14,18 +14,11 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 // const API = 'http://121.40.189.20:9001'  //生产
 const API = 'http://121.40.189.20:6001'  //测试
 // const API = 'http://192.168.3.18:6001'  //B
-<<<<<<< HEAD
 // const API = 'http://172.16.0.237:6001' //Q
 // const API = 'http://172.16.1.43:6001' //w
-=======
 // const API = 'http://172.16.1.30:6001' //Q
-<<<<<<< HEAD
 // const API = 'http://172.16.1.43:6001' //w
-=======
 // const API = 'http://172.16.1.17:6001' //w
->>>>>>> 14df1eebfbde9573a5c541678ad9dfbb33797007
->>>>>>> 2fbaf17b60f7f1acb11b1a884129643927270d1b
-
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
 // 这里只列一部分，具体配置参考文档