From 45cc629e573122ceb078ee6d4116aa0de04131ba Mon Sep 17 00:00:00 2001
From: Chris Brown <code@drbyte.dev>
Date: Thu, 26 Sep 2019 11:45:20 -0400
Subject: [PATCH] Fix merge conflict

---
 src/TenancyServiceProvider.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/TenancyServiceProvider.php b/src/TenancyServiceProvider.php
index 14d2871b..66f5dbf1 100644
--- a/src/TenancyServiceProvider.php
+++ b/src/TenancyServiceProvider.php
@@ -99,5 +99,4 @@ class TenancyServiceProvider extends ServiceProvider
             }
         });
     }
-
 }