From d9fe17443b0daeae249b6b02b267f1ba94b59d58 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Sun, 29 Jun 2014 13:11:27 +0200
Subject: [PATCH] Allow empty json files to be merged into a config, fixes
 #3055

---
 src/Composer/Config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Composer/Config.php b/src/Composer/Config.php
index 8d41f3fb1..f22604ee3 100644
--- a/src/Composer/Config.php
+++ b/src/Composer/Config.php
@@ -90,7 +90,7 @@ class Config
      *
      * @param array $config
      */
-    public function merge(array $config)
+    public function merge($config)
     {
         // override defaults with given config
         if (!empty($config['config']) && is_array($config['config'])) {