From c7f8afcde4024ef3266bec150c9000fc288dc282 Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Sun, 23 Feb 2025 13:37:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jiuyi2/common/js/config.js | 4 ----
 jiuyi2/vite.config.js      | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index 4336ad84..d9448b2f 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -7,10 +7,6 @@ const config = {
 	// #endif
 	// #ifndef H5
 	host: 'http://91f.xyz:8080',
-<<<<<<< HEAD
-	// host: 'https://1a880cd5.r24.cpolar.top/',
-=======
->>>>>>> 409f137e8990b13381bdbe7efca7eec9a3cfc89e
 	// #endif
 	// 支付方式配置
 	payType: {
diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index c88a2788..fc5535df 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -4,10 +4,6 @@ import {
 import uni from '@dcloudio/vite-plugin-uni';
 
 let target = 'http://91f.xyz:8080'
-<<<<<<< HEAD
-// let target = 'https://1a880cd5.r24.cpolar.top/'
-=======
->>>>>>> 409f137e8990b13381bdbe7efca7eec9a3cfc89e
 
 export default defineConfig({
 	plugins: [uni()],