fixed conflicts

2013-06-12 11:04:54 +02:00 · 2013-06-12 11:04:54 +02:00 · 6cfaa0ef35
commit 6cfaa0ef35
parent 0c67e4e0b8 a9fd149f3d
3 changed files with 7 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,10 @@ Changelog
 -----
 * Rails 4 rc2

+0.3.1
+-----
+* Updated gems
+
 0.3.0
 -----
 * Fontawesome 3.1.1
--- a/2
+++ b/2
@ -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'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -73,6 +73,7 @@ GEM
    crack (0.4.0)
      safe_yaml (~> 0.9.0)
    daemons (1.1.9)
+    database_cleaner (1.0.1)
    debug_inspector (0.0.2)
    debugger (1.6.0)
      columnize (>= 0.3.1)
@ -279,7 +280,7 @@ DEPENDENCIES
  capybara
  coffee-rails (~> 4.0.0)
  coveralls
-  database_cleaner!
+  database_cleaner
  debugger
  delorean
  email_spec