From 2917ebfef2e8e372a6d522a6bfd64e75649d4c3e Mon Sep 17 00:00:00 2001
From: Daniel Schiavone <daniel@snakehill.net>
Date: Mon, 25 Sep 2023 16:33:16 -0400
Subject: [PATCH] CVACMS-15055: Resolve conflict in composer.lock.

---
 composer.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index 0b7b8051565..603dd5db897 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9a4db450cfbac8ae135ce9eeaf598d54",
+    "content-hash": "26fb1d4cd88826bed373980e1990fc8b",
     "packages": [
         {
             "name": "alchemy/zippy",