fix conflicts

2017-05-07 09:56:20 -05:00
parent 758392c30f ba5c294598
commit 11dfcf6d1a
8 changed files with 37 additions and 7 deletions
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -34,6 +34,6 @@ class LoginController extends Controller
     */
    public function __construct()
    {
-        $this->middleware('guest', ['except' => 'logout']);
+        $this->middleware('guest')->except('logout');
    }
 }