diff --git a/.env b/.env
index 63561ee..c855deb 100644
--- a/.env
+++ b/.env
@@ -11,13 +11,8 @@ SHOPRO_BASE_URL = https://zysc.fjptzykj.com
 
 # 后端接口 - 测试环境（通过 process.env.NODE_ENV = development）
 SHOPRO_DEV_BASE_URL = https://zysc.fjptzykj.com
-<<<<<<< Updated upstream
 #SHOPRO_DEV_BASE_URL = http://192.168.10.36:6127
 #SHOPRO_DEV_BASE_URL = http://192.168.10.29:6127
-=======
-#SHOPRO_DEV_BASE_URL = http://127.0.0.1:48080
-#SHOPRO_DEV_BASE_URL = http://192.168.10.5:6127
->>>>>>> Stashed changes
 #SHOPRO_DEV_BASE_URL = http://192.168.1.12:6127
 #SHOPRO_DEV_BASE_URL = http://192.168.10.75:6127
 #SHOPRO_DEV_BASE_URL = http://192.168.1.9:6127