diff --git a/vue.config.js b/vue.config.js
index 95ea7d6..e602376 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -40,11 +40,7 @@ module.exports = {
       "/api": {
         //本地服务接口地址
         // target: 'http://192.168.1.34:8008',
-<<<<<<< HEAD
         target: 'http://192.168.3.32:81',
-=======
-        target: "http://192.168.3.32:8008",
->>>>>>> 8485163d5bb04ed591fdacf36ede1af8f45e82a8
         ws: true,
         pathRewrite: {
           "^/api": "/",