From 89ed6cce8e8c820cf55d73c80bae157ef7a40c04 Mon Sep 17 00:00:00 2001
From: Stephen <stephenahq@gmail.com>
Date: Wed, 16 Oct 2024 05:18:12 +1000
Subject: [PATCH] Resolved merge conflict in Gemfile.lock

---
 Gemfile.lock | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a1ca70b8e..6f3e432b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -241,11 +241,7 @@ GEM
     tilt (2.4.0)
     timeout (0.4.1)
     timers (4.3.5)
-<<<<<<< HEAD
-    tins (1.34.0)
-=======
     tins (1.35.0)
->>>>>>> pr/zinduolis/3162-1
       bigdecimal
       sync
     tzinfo (2.0.6)