Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflicts

This commit is contained in:
Taylor Otwell 2016-08-23 15:08:01 +02:00
parent e959c22840 982e769d2a
commit 6f6851946b
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Exceptions/Handler.php
View File

@ -18,6 +18,7 @@ class Handler extends ExceptionHandler
\Illuminate\Auth\Access\AuthorizationException::class, \Illuminate\Auth\Access\AuthorizationException::class,
\Symfony\Component\HttpKernel\Exception\HttpException::class, \Symfony\Component\HttpKernel\Exception\HttpException::class,
\Illuminate\Database\Eloquent\ModelNotFoundException::class, \Illuminate\Database\Eloquent\ModelNotFoundException::class,
\Illuminate\Session\TokenMismatchException,
\Illuminate\Validation\ValidationException::class, \Illuminate\Validation\ValidationException::class,
]; ];

2
config/app.php
View File

@ -167,6 +167,8 @@
* Package Service Providers... * Package Service Providers...
*/ */
//
/* /*
* Application Service Providers... * Application Service Providers...
*/ */