fixed conflicts

2013-06-12 11:04:54 +02:00
parent 0c67e4e0b8 a9fd149f3d
commit 6cfaa0ef35
3 changed files with 7 additions and 2 deletions
@@ -64,7 +64,7 @@ end
 group :test do
  gem 'capybara'
  gem 'coveralls', require: false
-  gem 'database_cleaner', github: 'bmabey/database_cleaner', ref: '20136e89'
+  gem 'database_cleaner'
  gem 'email_spec'
  gem 'launchy'
  gem 'rspec'