fix conflicts

2015-12-03 12:26:26 -06:00
parent 8414d45cdc f426638445
commit a690bb7552
6 changed files with 6 additions and 7 deletions
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -17,7 +17,7 @@ class RedirectIfAuthenticated
    public function handle($request, Closure $next)
    {
        if (Auth::check()) {
-            return redirect('/home');
+            return redirect('/');
        }

        return $next($request);