Permalink
Browse files

Merge Conflicts solved

  • Loading branch information...
2 parents 026ddd2 + a1cdf85 commit df5636305e876667d9c2aed551f4b1396e315128 gmagholder@me.com committed Mar 20, 2013
Showing with 3 additions and 0 deletions.
  1. +3 −0 .gitignore
View
@@ -8,10 +8,13 @@ InstalledFiles
_yardoc
coverage
doc/
+coverage
+InstalledFiles
lib/bundler/man
pkg
rdoc
spec/reports
test/tmp
test/version_tmp
tmp
+

0 comments on commit df56363

Please sign in to comment.