From a8cfea7a8539058ae574bfbad319128f9b579aa4 Mon Sep 17 00:00:00 2001
From: Adnan Tawaffani <adnan.tawaffani@gmail.com>
Date: Thu, 29 Jan 2015 14:47:11 +0700
Subject: [PATCH] Fix params mergeConfigFrom

---
 src/Intervention/Image/ImageServiceProviderLaravel5.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Intervention/Image/ImageServiceProviderLaravel5.php b/src/Intervention/Image/ImageServiceProviderLaravel5.php
index 5c822076..643ec809 100644
--- a/src/Intervention/Image/ImageServiceProviderLaravel5.php
+++ b/src/Intervention/Image/ImageServiceProviderLaravel5.php
@@ -43,8 +43,8 @@ class ImageServiceProviderLaravel5 extends ServiceProvider
 
         // merge default config
         $this->mergeConfigFrom(
-            'image',
-            __DIR__.'/../../config/config.php'
+            __DIR__.'/../../config/config.php',
+            'image'
         );
 
         // create image
@@ -69,8 +69,8 @@ class ImageServiceProviderLaravel5 extends ServiceProvider
 
         // merge default config
         $this->mergeConfigFrom(
-            'imagecache',
-            $config
+            $config,
+            'imagecache'
         );
 
         $config = $app['config'];