Permalink
Browse files

update gitignore

  • Loading branch information...
1 parent 58e5b1a commit bff12b85e8f5031626fc0abe68462093562c4722 @amro committed Jun 8, 2012
Showing with 3 additions and 8 deletions.
  1. +3 −8 .gitignore
View
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-=======
# rcov generated
coverage
@@ -33,7 +27,7 @@ pkg
#
# For MacOS:
#
-#.DS_Store
+.DS_Store
#
# For TextMate
#*.tmproj
@@ -51,4 +45,5 @@ bin
cache
gems
specifications
->>>>>>> a574da36fd93ce0acc0703513e6c77a5b586b502
+Gemfile.lock
+.rvmrc

0 comments on commit bff12b8

Please sign in to comment.