dev

config/dev.js

@@ -9,13 +9,8 @@ module.exports = {
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-<<<<<<< HEAD
     HOST: '"http://192.168.0.84:8080"',
     WSS_HOST: '"ws://192.168.0.84:8080"',
-=======
-    // HOST: '"http://192.168.0.72:8080"',
-    // WSS_HOST: '"ws://192.168.0.72:8080"',
->>>>>>> 98c51b29fcaf09777e99e552673390eec9f36b96
   },
   weapp: {},
   h5: {}