From fb31caefefafd70e253a84d35069b69223c9ef9a Mon Sep 17 00:00:00 2001
From: Sommerregen <sommerregen@users.noreply.github.com>
Date: Wed, 6 May 2015 23:01:35 +0200
Subject: [PATCH] Changed "mergeConfig" head to match previous method signature

---
 system/src/Grav/Common/Plugin.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/system/src/Grav/Common/Plugin.php b/system/src/Grav/Common/Plugin.php
index 474c69b30..abcb8b794 100644
--- a/system/src/Grav/Common/Plugin.php
+++ b/system/src/Grav/Common/Plugin.php
@@ -138,14 +138,13 @@ class Plugin implements EventSubscriberInterface
      *
      * @param Page  $page    The page to merge the configurations with the
      *                       plugin settings.
+     * @param bool  $deep    Should you use deep or shallow merging
      * @param array $params  Array of additional configuration options to
      *                       merge with the plugin settings.
      *
-     * @param bool  $deep    Should you use deep or shallow merging
-     *
      * @return \Grav\Common\Data\Data
      */
-    protected function mergeConfig(Page $page, $params = [], $deep = false)
+    protected function mergeConfig(Page $page, $deep = false, $params = [])
     {
         $class_name = $this->name;
         $class_name_merged = $class_name . '.merged';