merge conflict

This commit is contained in:
Hakim El Hattab committed 2016-01-08 10:21:35 +01:00
commit 1d6848a782
2 files changed
+7 -2

No files matched your search

+1 -1
View File
@@ -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"
},