From 5cfdeee7431d4665bda931a2a82aa9e96fd8c8bf Mon Sep 17 00:00:00 2001 From: jitendra Date: Tue, 4 Dec 2018 11:41:55 +0530 Subject: [PATCH] Fixed Conflicts --- packages/Webkul/User/src/Http/Middleware/Bouncer.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/Webkul/User/src/Http/Middleware/Bouncer.php b/packages/Webkul/User/src/Http/Middleware/Bouncer.php index 71ba9998c..4e84ab952 100644 --- a/packages/Webkul/User/src/Http/Middleware/Bouncer.php +++ b/packages/Webkul/User/src/Http/Middleware/Bouncer.php @@ -4,11 +4,7 @@ namespace Webkul\User\Http\Middleware; use Closure; use Illuminate\Support\Facades\Auth; -<<<<<<< HEAD use Illuminate\Support\Facades\Route; -======= -use Route; ->>>>>>> a60ca52eb69bf055764c4f182e32adc54b39a2a3 class Bouncer {