fix conflicts

This commit is contained in:
Taylor Otwell
2016-07-09 11:28:21 -05:00
8 changed files with 12 additions and 7 deletions

View File

@@ -148,7 +148,7 @@ return [
|
*/
'domain' => null,
'domain' => env('SESSION_DOMAIN', null),
/*
|--------------------------------------------------------------------------