有冲突

f4ed2cba · gaolei · 3fae32a4 · f4ed2cba
Commit f4ed2cba authored Jan 16, 2018 by gaolei
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

package.json
+1 -1

No files found.
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
  "author": "xin3w <xin3w@126.com>",
  "private": true,
  "scripts": {
-    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 172.16.4.38",
+    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 172.16.10.57",
    "start": "npm run dev",
    "build": "node build/build.js"
  },