fixing conflicts

This commit is contained in:
Taylor Otwell
2017-08-30 11:55:27 +02:00
19 changed files with 122 additions and 95 deletions

View File

@@ -167,7 +167,6 @@ return [
/*
* Package Service Providers...
*/
Laravel\Tinker\TinkerServiceProvider::class,
/*
* Application Service Providers...