From 31e2f43cfbfa19c0804c26785b27ab43f8a070af Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 14 Jun 2023 14:46:54 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84proxy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 proxy.config.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/proxy.config.json b/proxy.config.json
index 81592ef..d1368d5 100644
--- a/proxy.config.json
+++ b/proxy.config.json
@@ -1,11 +1,8 @@
 {
   "/api": {
     "target": "https://121.36.37.70:8204/",
-<<<<<<< HEAD
     "测试": "https://121.36.37.70:8204/",
     "生产": "https://fx.anxincloud.cn/",
-=======
->>>>>>> 1af64195fbad28ee962a81913395cde18a4de404
     "secure": false,
     "changeOrigin": true
   },