From 36f0ffc9c2bcbc99fb4994a778973ce52887baa5 Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Wed, 24 Jun 2020 13:28:35 -0500
Subject: [PATCH] Issue #3153869 by jungle: Remove leftover of
wikimedia/composer-merge-plugin
---
composer.json | 5 -----
composer.lock | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/composer.json b/composer.json
index 338e28bc92b0..8a17fafda208 100644
--- a/composer.json
+++ b/composer.json
@@ -48,11 +48,6 @@
"You can read more about this composer repository at:",
"https://www.drupal.org/node/2718229"
],
- "merge-plugin": {
- "recurse": true,
- "replace": false,
- "merge-extra": false
- },
"installer-paths": {
"core": ["type:drupal-core"],
"libraries/{$name}": ["type:drupal-library"],
diff --git a/composer.lock b/composer.lock
index 097bdbfa31ee..37c95a8604c4 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": "bf3f5b1c0d2f35255e03825589a1ee4f",
+ "content-hash": "b0f25f872cb3e35d4a7caf8c48aaa3c5",
"packages": [
{
"name": "asm89/stack-cors",
--
GitLab