Upgrading wikimedia/composer-merge-plugin to 1.4.1. (#1795)

acquia · Jul 13, 2017 · 365ab06 · 365ab06
1 parent 5036a77
commit 365ab06
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 63 deletions.
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
         "squizlabs/php_codesniffer":        "^2.7",
         "symfony/yaml":                     "^2.8.11",
         "symfony/console":                  "^2.8.11",
-        "wikimedia/composer-merge-plugin":  "dev-master",
+        "wikimedia/composer-merge-plugin":  "^1.4.1",
         "consolidation/robo":               "^1.1.0",
         "tivie/php-os-detector":            "^1.0",
         "consolidation/robo": "^1.1.0",

diff --git a/composer.lock b/composer.lock