解决冲突
Showing
| ... | @@ -8,7 +8,7 @@ | ... | @@ -8,7 +8,7 @@ |
| "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", | "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", | ||
| "start": "npm run dev", | "start": "npm run dev", | ||
| "lint": "eslint --ext .js,.vue src", | "lint": "eslint --ext .js,.vue src", | ||
| "serve" : "node --max_old_space_size=4096 node_modules/.bin/vue-cli-service serve --open", | "serve": "node --max_old_space_size=4096 node_modules/.bin/vue-cli-service serve --open", | ||
| "build": "node --max-old-space-size=4096 build/build.js" | "build": "node --max-old-space-size=4096 build/build.js" | ||
| }, | }, | ||
| "dependencies": { | "dependencies": { | ||
| ... | @@ -59,7 +59,7 @@ | ... | @@ -59,7 +59,7 @@ |
| "babel-plugin-transform-vue-jsx": "^3.5.0", | "babel-plugin-transform-vue-jsx": "^3.5.0", | ||
| "babel-preset-env": "^1.7.0", | "babel-preset-env": "^1.7.0", | ||
| "babel-preset-stage-2": "^6.22.0", | "babel-preset-stage-2": "^6.22.0", | ||
| "chalk": "^2.0.1", | "chalk": "^2.4.2", | ||
| "copy-webpack-plugin": "^4.0.1", | "copy-webpack-plugin": "^4.0.1", | ||
| "css-loader": "^0.28.11", | "css-loader": "^0.28.11", | ||
| "eslint": "^4.15.0", | "eslint": "^4.15.0", | ||
| ... | ... |
This diff is collapsed.
Please register or sign in to comment