Permalink
Browse files

Resolved .gitignore merge conflict

  • Loading branch information...
2 parents 4e706b3 + ad707af commit cda5e20f1e61bcf714279e377d0c5fcb393b42b5 Gunnar Magholder committed Jul 11, 2013
Showing with 16 additions and 2 deletions.
  1. +14 −2 .gitignore
  2. +2 −0 README.md
View
@@ -1,2 +1,14 @@
-*~
-.*
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+pids
+logs
+results
+
+npm-debug.log
View
@@ -0,0 +1,2 @@
+mynode
+======

0 comments on commit cda5e20

Please sign in to comment.