diff --git a/.env.development b/.env.development
index bf875f2d..9306ed7b 100644
--- a/.env.development
+++ b/.env.development
@@ -7,13 +7,8 @@ VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
 # 接口地址
 #VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
 #VUE_APP_WS_API = 'ws://localhost:8000'
-<<<<<<< HEAD
-#VUE_APP_API_BASEURL = http://222.222.144.147:6013/api
-VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
-=======
 VUE_APP_API_BASEURL = http://222.222.144.147:6013/api
 #VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
->>>>>>> 4322fb11086b4b90803c346a57bc2007dd984e5b
 #VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
 #VUE_APP_BASEURL = http://127.0.0.1:8000