From ab39928080f9fc74e9b4bbcc2c8eb63110603ec2 Mon Sep 17 00:00:00 2001
From: Gabe Farrell <gabe@mnrva.dev>
Date: Tue, 14 May 2024 16:28:43 -0400
Subject: [PATCH] Repair Gemfile.lock

---
 Gemfile.lock | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 92ca3772..f82d1360 100644
--- 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)