diff options
author | Hakim El Hattab | 2016-12-01 10:34:02 +0100 |
---|---|---|
committer | Hakim El Hattab | 2016-12-01 10:34:02 +0100 |
commit | f0dfb5b5e337f26a016324dd504829d128fab52b (patch) | |
tree | 5f99bb925e933b9a265ea31aa85a36f16e4e61c0 | |
parent | e460b2bd4b07652a489d60ce879548f22900c7cc (diff) | |
parent | b4d46d2b7c8a37de4e5b866412fe92e8f16d37fe (diff) |
merge package version conflicts
-rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index c96e4fd..f0dcedf 100644 --- 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" } |