CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-18 06:35:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflict with phantomjs-prebuilt dependency

Browse Source
This commit is contained in:
Bryan Housel
2016-08-08 11:07:58 -04:00
parent 1e1df9635d a1cef4b6ff
commit 77a037b225
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+14 -14
View File
@@ -31,32 +31,32 @@
"togeojson": "0.13.0"
},
"devDependencies": {
"chai": "3.5.0",
"chai": "~3.5.0",
"d3": "3.5.5",
"editor-layer-index": "git://github.com/osmlab/editor-layer-index.git#gh-pages",
"eslint": "~3.2.0",
"glob": "~7.0.5",
"happen": "0.3.1",
"http-server": "0.9.0",
"js-yaml": "3.6.1",
"jsonschema": "1.1.0",
"happen": "~0.3.1",
"http-server": "~0.9.0",
"js-yaml": "~3.6.1",
"jsonschema": "~1.1.0",
"maki": "0.5.0",
"minimist": "~1.2.0",
"mocha": "3.0.1",
"mocha-phantomjs-core": "2.0.1",
"mocha": "~3.0.2",
"mocha-phantomjs-core": "~2.0.1",
"name-suggestion-index": "0.1.1",
"phantomjs-prebuilt": "2.1.11",
"phantomjs-prebuilt": "~2.1.11",
"request": "~2.73.0",
"rollup": "0.34.5",
"rollup": "0.34.7",
"rollup-plugin-commonjs": "3.3.1",
"rollup-plugin-node-resolve": "2.0.0",
"sinon": "1.17.5",
"sinon-chai": "2.8.0",
"sinon": "~1.17.5",
"sinon-chai": "~2.8.0",
"smash": "0.0",
"svg-sprite": "1.3.3",
"uglify-js": "2.7.0",
"xml2js": "0.4.17",
"xmlbuilder": "8.2.2"
"uglify-js": "~2.7.0",
"xml2js": "~0.4.17",
"xmlbuilder": "~8.2.2"
},
"greenkeeper": {
"ignore": [