Repair Gemfile.lock

2 years ago · ab39928080
parent f152356c54
commit ab39928080
1 changed files with 1 additions and 5 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -451,12 +451,8 @@ GEM
    stimulus-rails (1.3.0)
      railties (>= 6.0.0)
    stringio (3.1.0)
-<<<<<<< HEAD
-    temple (0.10.3)
-    thor (1.3.0)
-=======
    thor (1.3.1)
->>>>>>> 16f5808c (Merge pull request #5 from edcommonwealth/dependabot/bundler/rails-7.1.3.1)
+    temple (0.10.3)
    tilt (2.3.0)
    timecop (0.9.8)
    timeout (0.4.1)