merge conflict

eliyara · Jan 8, 2016 · 1d6848a · 1d6848a
2 parents 19a8017 + de4efa5
commit 1d6848a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,13 @@
+.idea/
+*.iml
+*.iws
+*.eml
+out/
 .DS_Store
 .svn
 log/*.log
 tmp/**
 node_modules/
 .sass-cache
 css/reveal.min.css
-js/reveal.min.js
+js/reveal.min.js
diff --git 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"
   },