From cc848c90a7c8c199980dddf48f6522fa18be40e1 Mon Sep 17 00:00:00 2001
From: ArnabChatterjee20k <arnabchatterjee.ac.2@gmail.com>
Date: Thu, 16 Oct 2025 14:25:22 +0530
Subject: [PATCH] updated lock file

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

diff --git a/composer.lock b/composer.lock
index aa66aece6c..3d9792b60f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,11 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-<<<<<<< HEAD
-    "content-hash": "8a6a4234babe4408b47399967715f765",
-=======
-    "content-hash": "9658991ad6520dad5807d7e1ed1e9bd4",
->>>>>>> upstream/1.8.x
+    "content-hash": "f0e24bac21a79de31c550b8f0ffa2405",
     "packages": [
         {
             "name": "adhocore/jwt",