diff --git a/common/config.js b/common/config.js
index 206b2e8..1e528e7 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,11 +1,8 @@
 export default {
 	// baseUrl : 'http://127.0.0.1:8000',
     // baseUrl: 'https://api.book118.com',
-<<<<<<< HEAD
 	baseUrl:'https://houserent-admin.hhlm1688.com'
 	// baseUrl:'http://h5.xzaiyp.top'
-=======
 	// baseUrl:'https://houserent-admin.hhlm1688.com'
-	baseUrl:'http://h5.xzaiyp.top'
->>>>>>> 601be7eea191cf9a0655626cd6f7f00e28a5200e
+	// baseUrl:'http://h5.xzaiyp.top'
 }
\ No newline at end of file