From 616e9c19b5406f0707778c89cf7848c5aee25c88 Mon Sep 17 00:00:00 2001
From: Daniel Schiavone <daniel@snakehill.net>
Date: Wed, 20 Sep 2023 15:34:16 -0400
Subject: [PATCH] VACMS-15055: Resolve composer.lock conflict.

---
 composer.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.lock b/composer.lock
index 1972cfa09ff..4f3d7108751 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": "6bc5ebbdf4ebb52232e3e6893edd1942",
+    "content-hash": "8c8252f4d3e2863caeaf1846c76b67b2",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -27826,5 +27826,5 @@
     "platform-overrides": {
         "php": "8.1"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }