Shivan
/
tubestats-presentation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge conflict

This commit is contained in:
Hakim El Hattab 2016-01-08 10:21:35 +01:00
parent 19a801799a de4efa5d19
commit 1d6848a782
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,3 +1,8 @@
.idea/
*.iml
*.iws
*.eml
out/
.DS_Store .DS_Store
.svn .svn
log/*.log log/*.log

2
package.json
View File

@ -24,7 +24,7 @@
"dependencies": { "dependencies": {
"express": "~4.13.3", "express": "~4.13.3",
"grunt-cli": "^0.1.13", "grunt-cli": "^0.1.13",
"mustache": "~2.1.3", "mustache": "~2.2.1",
"socket.io": "~1.3.7", "socket.io": "~1.3.7",
"underscore": "~1.8.3" "underscore": "~1.8.3"
}, },