Permalink
Browse files

Forgot to resolve conflicts in .gitignore

  • Loading branch information...
1 parent b83d69c commit b94550344e3a2561f0216107e8cf92b6e6ef24aa @winton winton committed Feb 4, 2010
Showing with 2 additions and 9 deletions.
  1. +2 −9 .gitignore
View
11 .gitignore
@@ -1,14 +1,7 @@
.DS_Store
-<<<<<<< HEAD
-coverage
-pkg
-tmp
-
-spec/db/log/*.log
-=======
*.gem
*.gemspec
coverage
pkg
-tmp
->>>>>>> e5cd59729f755a3487717603caf0e59f5753c34b
+spec/db/log/*.log
+tmp

0 comments on commit b945503

Please sign in to comment.