Version 2.0.0

2016-01-07 11:37:52 +01:00 · 2016-01-07 11:37:52 +01:00 · 7847e87a8b
commit 7847e87a8b
parent 63a7ae51a5
2 changed files with 2 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -46,6 +46,7 @@ npm*
 *.gz

 # Other
+*_conflict-
 .notes.txt
 .idea
 *.ipr
--- a/.npmignore
+++ b/.npmignore
@ -10,3 +10,4 @@ CVS
 npm-debug.log
 *.sublime-project
 *.sublime-workspace
+*_conflict-