merge conflict

2016-01-08 10:21:35 +01:00 · 2016-01-08 10:21:35 +01:00 · 1d6848a782
commit 1d6848a782
parent 19a801799a de4efa5d19
2 changed files with 7 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,8 @@
+.idea/
+*.iml
+*.iws
+*.eml
+out/
 .DS_Store
 .svn
 log/*.log
@ -5,4 +10,4 @@ tmp/**
 node_modules/
 .sass-cache
 css/reveal.min.css
-js/reveal.min.js
+js/reveal.min.js
--- a/package.json
+++ b/package.json
@ -24,7 +24,7 @@
  "dependencies": {
    "express": "~4.13.3",
    "grunt-cli": "^0.1.13",
-    "mustache": "~2.1.3",
+    "mustache": "~2.2.1",
    "socket.io": "~1.3.7",
    "underscore": "~1.8.3"
  },