diff --git a/vue.config.js b/vue.config.js
index dee72d0..de5e859 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -46,25 +46,15 @@ module.exports = {
     // 这里写入需要代理的api和对应的目标地址
     proxy: {
       '/api': {
-<<<<<<< HEAD
         target: 'http://localhost:8080',
         // target: 'http://192.168.0.148:8080',
-=======
-<<<<<<< HEAD
-        // target: 'http://localhost:8080',
-        target: 'http://192.168.0.148:8080',
-=======
-        // target: 'http://192.168.0.148:8080',
-        target: 'http://a.wms.picaiba.com/api',
->>>>>>> 14bf2dc2f6d116f4005fe216e91bb59aa7ba338f
->>>>>>> develop
+        // target: 'http://a.wms.picaiba.com/api',
         // target: 'http://192.168.0.127:8080',
         // target: 'http://192.168.0.165:8080',
         // target: 'http://192.168.43.105:8080',
         // target: 'http://127.0.0.1:8080',
         // target: 'http://192.168.0.70:8080',
         // target: 'http://192.168.0.199:8080',
-
         ws: true,
         changeOrigin: true,
         pathRewrite: {