diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index b0653f9..317e23b 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -22,11 +22,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
 
 
-<<<<<<< HEAD
-  baseURL = 'http://128.10.249.26:9003';
-=======
   // baseURL = 'http://128.10.249.23:9003';
->>>>>>> 2727043f776460ef29f119ecf30a65f746104338
 
 
 } else {