Merge branch 'master' of github.com:balkian/hook.io-web40

Conflicts: .gitignore
12 years ago · bfb6d73cd2
parent c679d498f4 f5eb9d8a4e
commit bfb6d73cd2
2 changed files with 16 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,3 +4,17 @@ node_modules
 *.bak
 *.swp
 SOJA
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+pids
+logs
+results
+
+npm-debug.log
--- a/README.md
+++ b/README.md
@ -0,0 +1,2 @@
+hook.io-web40
+=============