Browse Source

Maintenance: Bump rszr to newest version (1.2.1).

Dominik Klein 3 years ago
parent
commit
a05cf696e9
1 changed files with 3 additions and 0 deletions
  1. 3 0
      Gemfile.lock

+ 3 - 0
Gemfile.lock

@@ -700,7 +700,10 @@ DEPENDENCIES
   rchardet (>= 1.8.0)
   redis
   rspec-rails
+<<<<<<< HEAD
   rspec-retry
+=======
+>>>>>>> ba2ed2375 (Maintenance: Bump rszr to newest version (1.2.1).)
   rszr
   rubocop
   rubocop-faker