From de0e0d5cfcd0531efa4ecb81427a0e4226affc00 Mon Sep 17 00:00:00 2001
From: ljx <15723110242@139.com>
Date: Wed, 17 Sep 2025 09:11:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.env.development b/.env.development
index 090b058..d8d5b20 100644
--- a/.env.development
+++ b/.env.development
@@ -11,11 +11,9 @@ VITE_APP_ENV = 'development'
 # 李陈杰 209
 #  VITE_APP_BASE_API = 'http://192.168.110.209:8899'
 # 曾涛
-<<<<<<<<< Temporary merge branch 1
-# VITE_APP_BASE_API = 'http://192.168.110.149:8899'
-=========
+
 VITE_APP_BASE_API = 'http://192.168.110.209:8899'
->>>>>>>>> Temporary merge branch 2
+
 # 罗成
 # VITE_APP_BASE_API = 'http://192.168.110.188:8899'
 # 朱银