diff --git a/composer.json b/composer.json index 338e28bc92b0c6b4884b2f264c787912949a7afd..8a17fafda20806645e23bdb41f781145793cd9d8 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 c3cd54144ce35c2eff35add778129f8079bedc34..240193b8d34c54e4c096e6a4f71ef4163ea77ff8 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",