Permalink
Browse files

ignore...

  • Loading branch information...
1 parent 274c616 commit 626e8623077587ac87a851627f6508a1bf0d0d69 @christianhellsten committed Sep 28, 2012
Showing with 2 additions and 15 deletions.
  1. +2 −15 .gitignore
View
@@ -1,6 +1,6 @@
-<<<<<<< HEAD
*.gem
*.rbc
+/tmp/*
**/*.log
**/*.sqlite3
Gemfile.lock
@@ -19,21 +19,8 @@ spec/reports
test/tmp
test/version_tmp
tmp
-=======
-*.rbc
+**.orig
*.sassc
.sass-cache
-capybara-*.html
-.rspec
/.bundle
/vendor/bundle
-/log/*
-/tmp/*
-/db/*.sqlite3
-/public/system/*
-/coverage/
-/spec/tmp/*
-**.orig
-rerun.txt
-pickle-email-*.html
->>>>>>> f5dcde26e869385ee8c5a08e658869df628d91f7

0 comments on commit 626e862

Please sign in to comment.