Skip to content

Commit

Permalink
VACMS-15055: Resolve composer.lock conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
schiavo committed Sep 22, 2023
1 parent 37c741f commit eafcf06
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions composer.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit eafcf06

Please sign in to comment.