merge package version conflicts
commit
f0dfb5b5e3
|
@ -19,7 +19,7 @@
|
||||||
"url": "git://github.com/hakimel/reveal.js.git"
|
"url": "git://github.com/hakimel/reveal.js.git"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "~4.1.1"
|
"node": "~6.9.1"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"express": "~4.14.0",
|
"express": "~4.14.0",
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
"grunt-sass": "~1.2.0",
|
"grunt-sass": "~1.2.0",
|
||||||
"grunt-retire": "~0.3.10",
|
"grunt-retire": "~0.3.10",
|
||||||
"grunt-zip": "~0.17.1",
|
"grunt-zip": "~0.17.1",
|
||||||
"node-sass": "~3.7.0"
|
"node-sass": "~3.13.0"
|
||||||
},
|
},
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue