配置项

config/index.js

@@ -20,13 +20,8 @@ module.exports = {
     },
 
     // Various Dev Server settings
-<<<<<<< HEAD
-    // host: 'localhost', // can be overwritten by process.env.HOST
-    host: '192.168.3.126', // can be overwritten by process.env.HOST
-=======
     host: 'localhost', // can be overwritten by process.env.HOST
     // host: '192.168.3.126', // can be overwritten by process.env.HOST
->>>>>>> dev
     port: 8082, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

package.json

@@ -5,11 +5,7 @@
   "author": "Luolei <16657115156@163.com>",
   "private": true,
   "scripts": {
-<<<<<<< HEAD
-    "dev": "webpack-dev-server --inline --hot --progress --config build/webpack.dev.conf.js",
-=======
     "dev": "webpack-dev-server --inline --hot --config build/webpack.dev.conf.js",
->>>>>>> dev
     "start": "npm run dev",
     "build": "node build/build.js"
   },