Commit 8186b23a authored by catch's avatar catch
Browse files

Issue #3153869 by jungle, xjm, NickDickinsonWilde, longwave: [backport] Remove... 

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

composer.json

+0 −5
Original line number Diff line number Diff line
@@ -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"],

composer.lock

+1 −4
Original line number Diff line number Diff line
@@ -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": {