Commit 01908ccd authored by Jess's avatar Jess
Browse files

Issue #3153869 by jungle: Remove leftover of wikimedia/composer-merge-plugin 

(cherry picked from commit 36f0ffc9)
parent f63bd1c6

composer.json

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

composer.lock

+1 −1
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": "bf3f5b1c0d2f35255e03825589a1ee4f",

    "content-hash": "b0f25f872cb3e35d4a7caf8c48aaa3c5",

    "packages": [

        {

            "name": "asm89/stack-cors",