diff --git a/gasStation-uni/config.js b/gasStation-uni/config.js
index 25f634e11..10fe779c4 100644
--- a/gasStation-uni/config.js
+++ b/gasStation-uni/config.js
@@ -2,11 +2,8 @@
 module.exports = {
 	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
 	// baseUrl: 'http://192.168.0.196:8081/',
-<<<<<<< HEAD
 	baseUrl: 'http://192.168.1.6:8008/',
-=======
-	baseUrl: 'http://192.168.0.196:8080/',
->>>>>>> 6a67ef9347914e251c82bfcd14c04a8964fd161f
+
 	// baseUrl: 'http://192.168.1.5:8002/cdJdc',
 
 	imagesUrl: 'http://www.nuoyunr.com/lananRsc',
@@ -31,4 +28,4 @@ module.exports = {
 			}
 		]
 	}
-}
+}
\ No newline at end of file