From 6eff3c821b9d33d5fc3b7b76297371be19538ed8 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Tue, 15 Jun 2021 09:31:00 -0400
Subject: [PATCH] Update merge plugin.
---
composer.json | 2 +-
composer.lock | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/composer.json b/composer.json
index 2088f5001d9..10d965750aa 100644
--- a/composer.json
+++ b/composer.json
@@ -74,7 +74,7 @@
"vufind-org/vufindharvest": "4.0.1",
"vufind-org/vufindhttp": "3.1.0",
"webfontkit/open-sans": "^1.0",
- "wikimedia/composer-merge-plugin": "2.0.0",
+ "wikimedia/composer-merge-plugin": "2.0.1",
"wikimedia/less.php": "2.0.0",
"yajra/laravel-pdo-via-oci8": "2.2.0"
},
diff --git a/composer.lock b/composer.lock
index 3f893be2821..49b6a185230 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": "5dde5dd3bf9007b78fa283f6112fd170",
+ "content-hash": "01c3dd9c49ce7044b0600e9820289301",
"packages": [
{
"name": "ahand/mobileesp",
@@ -7281,7 +7281,7 @@
},
{
"name": "wikimedia/composer-merge-plugin",
- "version": "v2.0.0",
+ "version": "v2.0.1",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/composer-merge-plugin.git",
--
GitLab