Permalink
Browse files

fixed conflict

  • Loading branch information...
1 parent 8594ef7 commit 54669ce2cce15045833176ca065e993a8bdf6166 @rhiokim committed Sep 14, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 .gitignore
View
2 .gitignore
@@ -15,4 +15,4 @@ logs
results
node_modules
-npm-debug.log
+npm-debug.log

0 comments on commit 54669ce

Please sign in to comment.