repair gemfile.lock

10 years ago · 157ea9e9b4
parent db10d7c2ef
commit 157ea9e9b4
1 changed files with 0 additions and 5 deletions
--- a/Gemfile.lock
+++ b/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!