Merge pull request #259 from bagisto/jitendra

Fixed Conflicts
2018-12-04 11:42:34 +05:30 · 2018-12-04 11:42:34 +05:30 · e7796ced9e
parent 657bf1265b 5cfdeee743
commit e7796ced9e
1 changed files with 0 additions and 4 deletions
--- 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
 {