Trust merge plugin to write to files
This commit is contained in:
parent
b52b7c9a71
commit
ab6f5e4ea7
1 changed files with 2 additions and 1 deletions
|
@ -138,7 +138,8 @@
|
||||||
"cweagans/composer-patches": true,
|
"cweagans/composer-patches": true,
|
||||||
"drupal/core-composer-scaffold": true,
|
"drupal/core-composer-scaffold": true,
|
||||||
"composer/installers": true,
|
"composer/installers": true,
|
||||||
"drupal/core-project-message": false
|
"drupal/core-project-message": false,
|
||||||
|
"wikimedia/composer-merge-plugin": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
|
|
Loading…
Reference in a new issue