From 613ebf090d4c6c7aa04e5441a747b8a1b0de9e38 Mon Sep 17 00:00:00 2001
From: Luke Towers <github@luketowers.ca>
Date: Tue, 6 Jun 2017 09:28:50 -0600
Subject: [PATCH] Re-add the merge plugin

@daftspunk I readded the merge plugin accidentally removed in: https://github.com/octobercms/october/commit/db82bfa815b83ed6e954e0d918c3ee9a9e78c7ea
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c343d75bb..5bfb6980f 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,8 @@
         "october/system": "dev-l55upgrade",
         "october/backend": "dev-l55upgrade",
         "october/cms": "dev-l55upgrade",
-        "laravel/framework": "5.5.*@dev"
+        "laravel/framework": "5.5.*@dev",
+        "wikimedia/composer-merge-plugin": "dev-master"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",