Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3153869 by jungle, xjm, NickDickinsonWilde, longwave: [backport] Remove leftover of wikimedia/composer-merge-plugin

merge-requests/64/head
catch 2020-07-16 12:14:38 +01:00
parent 9d7cfefe1e
commit 8186b23ae7
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
composer.json
View File

@ -49,11 +49,6 @@
"You can read more about this composer repository at:", "You can read more about this composer repository at:",
"https://www.drupal.org/node/2718229" "https://www.drupal.org/node/2718229"
], ],
"merge-plugin": {
"recurse": true,
"replace": false,
"merge-extra": false
},
"installer-paths": { "installer-paths": {
"core": ["type:drupal-core"], "core": ["type:drupal-core"],
"libraries/{$name}": ["type:drupal-library"], "libraries/{$name}": ["type:drupal-library"],

5
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "ffa355776a1fae1e88712fae77cbc517", "content-hash": "a0aee7917924874fecf8fc9af3c86275",
"packages": [ "packages": [
{ {
"name": "asm89/stack-cors", "name": "asm89/stack-cors",
@ -4326,9 +4326,6 @@
"ext-zip": "Enabling the zip extension allows you to unzip archives", "ext-zip": "Enabling the zip extension allows you to unzip archives",
"ext-zlib": "Allow gzip compression of HTTP requests" "ext-zlib": "Allow gzip compression of HTTP requests"
}, },
"bin": [
"bin/composer"
],
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {