From f63e3800e39069e1f0a0237371366d91da407e2c Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 26 Mar 2025 19:04:08 +0800
Subject: [PATCH] =?UTF-8?q?refactor(config):=20=E6=B8=85=E7=90=86=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD=E7=9A=84=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除因合并冲突导致的重复配置项，确保配置文件的整洁性和一致性
---
 common/config.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/common/config.js b/common/config.js
index 206b2e8..1e528e7 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,11 +1,8 @@
 export default {
 	// baseUrl : 'http://127.0.0.1:8000',
     // baseUrl: 'https://api.book118.com',
-<<<<<<< HEAD
 	baseUrl:'https://houserent-admin.hhlm1688.com'
 	// baseUrl:'http://h5.xzaiyp.top'
-=======
 	// baseUrl:'https://houserent-admin.hhlm1688.com'
-	baseUrl:'http://h5.xzaiyp.top'
->>>>>>> 601be7eea191cf9a0655626cd6f7f00e28a5200e
+	// baseUrl:'http://h5.xzaiyp.top'
 }
\ No newline at end of file