fix conflicts

This commit is contained in:
Taylor Otwell
2015-12-03 12:26:26 -06:00
6 changed files with 6 additions and 7 deletions

View File

@@ -95,7 +95,7 @@ return [
|
*/
'log' => 'single',
'log' => env('APP_LOG', 'single'),
/*
|--------------------------------------------------------------------------
@@ -176,7 +176,6 @@ return [
'Gate' => Illuminate\Support\Facades\Gate::class,
'Hash' => Illuminate\Support\Facades\Hash::class,
'Input' => Illuminate\Support\Facades\Input::class,
'Inspiring' => Illuminate\Foundation\Inspiring::class,
'Lang' => Illuminate\Support\Facades\Lang::class,
'Log' => Illuminate\Support\Facades\Log::class,
'Mail' => Illuminate\Support\Facades\Mail::class,