repair gemfile.lock

pull/3053/head
Florian Kraft 10 years ago
parent db10d7c2ef
commit 157ea9e9b4
No known key found for this signature in database
GPG Key ID: 786CD08D94605A9E
  1. 5
      Gemfile.lock

@ -559,15 +559,10 @@ DEPENDENCIES
rubytree (~> 0.8.3)
sass (~> 3.4.12)
sass-rails!
<<<<<<< HEAD
selenium-webdriver (~> 2.44.0)
shoulda-context (~> 1.2)
shoulda-matchers (~> 2.8)
=======
selenium-webdriver (~> 2.45.0)
shoulda
shoulda-matchers (~> 2.5.0)
>>>>>>> release/4.1
simplecov (= 0.8.0.pre)
sprockets!
sprockets-rails!

Loading…
Cancel
Save