diff options
| author | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-01-08 10:21:35 +0100 |
|---|---|---|
| committer | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-01-08 10:21:35 +0100 |
| commit | 1d6848a78242bed53858e6bdc0c30f683b8c43ce (patch) | |
| tree | e10b9bc975479b54b087f9bfae226de72c5b6893 | |
| parent | 19a801799a79905e8ee95d0f6854d24b78787444 (diff) | |
| parent | de4efa5d194329095f90911101a67c5b5e13922f (diff) | |
| download | perl-software-in-gnu-guix-1d6848a78242bed53858e6bdc0c30f683b8c43ce.tar perl-software-in-gnu-guix-1d6848a78242bed53858e6bdc0c30f683b8c43ce.tar.gz | |
merge conflict
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 7 insertions, 2 deletions
@@ -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
\ No newline at end of file diff --git a/package.json b/package.json index fd8e36c..652bbed 100644 --- 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" }, |