Gemfile.lock: fix accidentally commited merge conflicts

Author: anarchivist

Gemfile.lock

@@ -236,20 +236,14 @@ GEM
       activestorage (= 7.0.8.7)
       activesupport (= 7.0.8.7)
       bundler (>= 1.15.0)
-<<<<<<< HEAD
-      railties (= 7.0.4.3)
+      railties (= 7.0.8.7)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-=======
-      railties (= 7.0.8.7)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
->>>>>>> e02b7af (Update to Ruby 3.3+ and latest Rails 7.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)