fix conflicts

This commit is contained in:
Taylor Otwell
2017-05-07 09:56:20 -05:00
8 changed files with 37 additions and 7 deletions

View File

@@ -42,7 +42,7 @@ $status = $kernel->handle(
| Shutdown The Application
|--------------------------------------------------------------------------
|
| Once Artisan has finished running. We will fire off the shutdown events
| Once Artisan has finished running, we will fire off the shutdown events
| so that any final work may be done by the application before we shut
| down the process. This is the last thing to happen to the request.
|