From eafcf06ff73e0bf58861205157ec7422df5be8f1 Mon Sep 17 00:00:00 2001
From: Daniel Schiavone <daniel@snakehill.net>
Date: Fri, 22 Sep 2023 10:54:32 -0400
Subject: [PATCH] VACMS-15055: Resolve composer.lock conflict.

---
 composer.lock | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/composer.lock b/composer.lock
index a9c2be045fa..0b7b8051565 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": "1655124486e64882fc1db0706bfbfe81",
+    "content-hash": "9a4db450cfbac8ae135ce9eeaf598d54",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -7682,10 +7682,6 @@
                     "name": "bnjmnm",
                     "homepage": "https://www.drupal.org/user/2369194"
                 },
-                {
-                    "name": "ivnish",
-                    "homepage": "https://www.drupal.org/user/3547706"
-                },
                 {
                     "name": "jrockowitz",
                     "homepage": "https://www.drupal.org/user/371407"
@@ -9061,10 +9057,6 @@
                     "name": "Mykhailo Gurei",
                     "homepage": "https://www.drupal.org/u/ozin",
                     "role": "Maintainer"
-                },
-                {
-                    "name": "voleger",
-                    "homepage": "https://www.drupal.org/user/3260314"
                 }
             ],
             "description": "Provide an additional custom fields which can be used on Menu link",
@@ -9966,6 +9958,10 @@
                     "name": "shadcn",
                     "homepage": "https://shadcn.com"
                 },
+                {
+                    "name": "roaguicr",
+                    "homepage": "https://www.drupal.org/user/2334450"
+                },
                 {
                     "name": "rrrob",
                     "homepage": "https://www.drupal.org/user/273533"