terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

fix: address merge conflict

Browse source
This commit is contained in:
Benjamin Coe 2016-11-22 10:20:18 -08:00
parent 5e2b426d33
commit 0f34b9b568
No known key found for this signature in database
GPG key ID: 60AB1C1D478E1286
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
package.json
View file

@ -84,8 +84,6 @@
"url": "0.11.0", "url": "0.11.0",
"webpack": "1.13.3", "webpack": "1.13.3",
"webpack-dev-server": "1.16.2", "webpack-dev-server": "1.16.2",
<<<<<<< HEAD
"sockjs-client": "1.1.1",
"write-file-webpack-plugin": "3.4.2" "write-file-webpack-plugin": "3.4.2"
}, },
"devDependencies": { "devDependencies": {
@ -93,16 +91,8 @@
"babel-eslint": "7.1.1", "babel-eslint": "7.1.1",
"babel-plugin-transform-remove-strict-mode": "0.0.2", "babel-plugin-transform-remove-strict-mode": "0.0.2",
"benchmark": "2.1.2", "benchmark": "2.1.2",
"write-file-webpack-plugin": "3.3.0"
},
"devDependencies": {
"ava": "0.16.0",
"babel-eslint": "7.0.0",
"babel-plugin-istanbul": "3.0.0",
"babel-plugin-transform-remove-strict-mode": "0.0.2",
"benchmark": "2.1.1",
"coveralls": "2.11.15", "coveralls": "2.11.15",
"cross-env": "^3.1.3", "cross-env": "3.1.3",
"gulp": "3.9.1", "gulp": "3.9.1",
"gulp-ava": "0.15.0", "gulp-ava": "0.15.0",
"gulp-babel": "6.1.2", "gulp-babel": "6.1.2",
@ -111,7 +101,7 @@
"gulp-notify": "2.2.0", "gulp-notify": "2.2.0",
"gulp-process-env": "0.0.2", "gulp-process-env": "0.0.2",
"husky": "0.11.9", "husky": "0.11.9",
"nyc": "9.0.1", "nyc": "10.0.0",
"run-sequence": "1.2.2", "run-sequence": "1.2.2",
"standard": "8.5.0", "standard": "8.5.0",
"webpack-stream": "3.2.0" "webpack-stream": "3.2.0"