From 1a0977f0c77b9cef539f20297a54b391b7dedd02 Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Tue, 25 Jul 2023 18:22:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BC=98=E5=8C=96=EF=BC=9B=E6=8A=A5=E8=AD=A6=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 4 ----
 1 file changed, 4 deletions(-)

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": "/",