From 1243353ffacfca2b1d4134f74ddeeb307a4cb8d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Thu, 15 Aug 2019 16:59:14 +0200
Subject: [PATCH] wip

---
 src/Commands/Install.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Commands/Install.php b/src/Commands/Install.php
index 753e65a3..29ac7cc5 100644
--- a/src/Commands/Install.php
+++ b/src/Commands/Install.php
@@ -35,13 +35,8 @@ class Install extends Command
         $this->info('✔️  Created config/tenancy.php');
 
         file_put_contents(app_path('Http/Kernel.php'), str_replace(
-<<<<<<< HEAD
             "protected \$middlewarePriority = [",
             "protected \$middlewarePriority = [\n        \Stancl\Tenancy\Middleware\InitializeTenancy::class,",
-=======
-            'protected $middlewarePriority = [',
-            "protected \$middlewarePriority = [\n        \Stancl\Tenancy\Middleware\InitializeTenancy::class",
->>>>>>> 01102f481e2d4ae09c812bd93493866b72b7a1b6
             file_get_contents(app_path('Http/Kernel.php'))
         ));
         $this->info('✔️  Set middleware priority');