blallo/presentazione-papero
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge package version conflicts

Browse Source
This commit is contained in:
Hakim El Hattab 2016-12-01 10:34:02 +01:00
commit f0dfb5b5e3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -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"
} }