diff --git a/config.js b/config.js
index 299e5a3..109b800 100644
--- a/config.js
+++ b/config.js
@@ -2,15 +2,11 @@
 export default {
   qnDomain: 'http://seueton5q.hn-bkt.clouddn.com/',
   uploadQiNiuDomain: 'https://upload-z2.qiniup.com',
- // baseUrl: 'https://vue.ruoyi.vip/prod-api',
-  // baseUrl: 'http://47.93.242.168:8080',
-<<<<<<< HEAD
-     // baseUrl: 'http://47.93.242.168:8080',
+// baseUrl: 'https://vue.ruoyi.vip/prod-api',
+// baseUrl: 'http://47.93.242.168:8080',
+// baseUrl: 'http://47.93.242.168:8080',
  baseUrl: 'http://localhost:8080',
-=======
-   //  baseUrl: 'http://47.93.242.168:8080',
-  baseUrl: 'http://localhost:8080',
->>>>>>> 628ee1926942d01758e141fb0b5393a175968240
+
   // 应用信息
   appInfo: {
     // 应用名称