From 8186b23ae71b4c76c50ec7ecf24defbd7a9e3f6c Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Thu, 16 Jul 2020 12:14:38 +0100
Subject: [PATCH] Issue #3153869 by jungle, xjm, NickDickinsonWilde, longwave:
[backport] Remove leftover of wikimedia/composer-merge-plugin
---
composer.json | 5 -----
composer.lock | 5 +----
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/composer.json b/composer.json
index a1076c104192..2e53f41a62d3 100644
--- a/composer.json
+++ b/composer.json
@@ -49,11 +49,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 6c58cb455f61..e6c4cac16b25 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": "ffa355776a1fae1e88712fae77cbc517",
+ "content-hash": "a0aee7917924874fecf8fc9af3c86275",
"packages": [
{
"name": "asm89/stack-cors",
@@ -4326,9 +4326,6 @@
"ext-zip": "Enabling the zip extension allows you to unzip archives",
"ext-zlib": "Allow gzip compression of HTTP requests"
},
- "bin": [
- "bin/composer"
- ],
"type": "library",
"extra": {
"branch-alias": {
--
GitLab