merge package version conflicts

2016-12-01 10:34:02 +01:00 · 2016-12-01 10:34:02 +01:00 · f0dfb5b5e3
commit f0dfb5b5e3
parent e460b2bd4b b4d46d2b7c
1 changed files with 2 additions and 2 deletions
--- a/package.json
+++ b/package.json
@ -19,7 +19,7 @@
    "url": "git://github.com/hakimel/reveal.js.git"
  },
  "engines": {
-    "node": "~4.1.1"
+    "node": "~6.9.1"
  },
  "dependencies": {
    "express": "~4.14.0",
@ -39,7 +39,7 @@
    "grunt-sass": "~1.2.0",
    "grunt-retire": "~0.3.10",
    "grunt-zip": "~0.17.1",
-    "node-sass": "~3.7.0"
+    "node-sass": "~3.13.0"
  },
  "license": "MIT"
 }