配置文件冲突解决

mini/utils/env.js

@@ -1,10 +1,7 @@
 const isTest = true;
 //172.31.31.35
 //172.31.31.92
-<<<<<<< HEAD
+
 export const baseUrl = isTest ? 'http://172.31.31.35/api/mini/' : 'https://t18.9026.com/api/mini/';
 export const imgHost = isTest ? 'http://172.31.31.35/images/' : 'https://t18.9026.com/images/'
-=======
-export const baseUrl = isTest ? 'http://172.31.30.176:8001/api/mini/' : 'https://t18.9026.com/api/mini/';
-export const imgHost = isTest ? 'http://172.31.30.176:8001/images/' : 'https://t18.9026.com/images/'
->>>>>>> 0710822a4e4663313112724c8776cf28752b2ca8
+