diff --git a/Gemfile.lock b/Gemfile.lock index 8c6e22892..7d75901fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,7 +144,10 @@ GEM dotenv (= 3.2.0) railties (>= 6.1) drb (2.2.3) +<<<<<<< HEAD dumb_delegator (1.1.0) +======= +>>>>>>> 886eccb (Update all Bundler dependencies (2026-04-17) (#1406)) erb (6.0.3) erubi (1.13.1) et-orbi (1.4.0) @@ -301,7 +304,11 @@ GEM tsort (>= 0.2) zeitwerk (~> 2.6) rainbow (3.1.1) +<<<<<<< HEAD rake (13.4.1) +======= + rake (13.4.2) +>>>>>>> 886eccb (Update all Bundler dependencies (2026-04-17) (#1406)) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) @@ -386,7 +393,13 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) sax-machine (1.3.2) securerandom (0.4.1) +<<<<<<< HEAD selenium-webdriver (4.10.0) +======= + selenium-webdriver (4.43.0) + base64 (~> 0.2) + logger (~> 1.4) +>>>>>>> 886eccb (Update all Bundler dependencies (2026-04-17) (#1406)) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0)