解决冲突

vue.config.js

@@ -3,10 +3,15 @@ const path = require("path");
 function resolve(dir) {
   return path.join(__dirname, dir);
 }
+<<<<<<< HEAD
 const serverHost = "http://192.168.1.32:8006"//波哥
+=======
+
+// const serverHost = "http://47.108.232.77:9537"//波哥
+>>>>>>> d62fe13f0fc132011350e58f5ca2d061210f35b5
 // const serverHost = "http://192.168.0.231:8006"//线上
 // const serverHost = "http://192.168.1.117:8006"//周
-// const serverHost = "http://192.168.1.98:8006"//毛毛
+const serverHost = "http://192.168.1.98:8006"//毛毛
 
 module.exports = {
   // configureWebpack: {