resolve conflicts and clean up file
This commit is contained in:
commit
196c267562
28
.env.example
28
.env.example
|
@ -1,26 +1,26 @@
|
||||||
APP_ENV=local
|
APP_ENV="local"
|
||||||
APP_KEY=
|
APP_KEY=
|
||||||
APP_DEBUG=true
|
APP_DEBUG=true
|
||||||
APP_LOG_LEVEL=debug
|
APP_LOG_LEVEL="debug"
|
||||||
APP_URL=http://localhost
|
APP_URL="http://localhost"
|
||||||
|
|
||||||
DB_CONNECTION=mysql
|
DB_CONNECTION="mysql"
|
||||||
DB_HOST=127.0.0.1
|
DB_HOST="127.0.0.1"
|
||||||
DB_PORT=3306
|
DB_PORT=3306
|
||||||
DB_DATABASE=homestead
|
DB_DATABASE="homestead"
|
||||||
DB_USERNAME=homestead
|
DB_USERNAME="homestead"
|
||||||
DB_PASSWORD=secret
|
DB_PASSWORD="secret"
|
||||||
|
|
||||||
CACHE_DRIVER=file
|
CACHE_DRIVER="file"
|
||||||
SESSION_DRIVER=file
|
SESSION_DRIVER="file"
|
||||||
QUEUE_DRIVER=sync
|
QUEUE_DRIVER="sync"
|
||||||
|
|
||||||
REDIS_HOST=127.0.0.1
|
REDIS_HOST="127.0.0.1"
|
||||||
REDIS_PASSWORD=null
|
REDIS_PASSWORD=null
|
||||||
REDIS_PORT=6379
|
REDIS_PORT=6379
|
||||||
|
|
||||||
MAIL_DRIVER=smtp
|
MAIL_DRIVER="smtp"
|
||||||
MAIL_HOST=mailtrap.io
|
MAIL_HOST="mailtrap.io"
|
||||||
MAIL_PORT=2525
|
MAIL_PORT=2525
|
||||||
MAIL_USERNAME=null
|
MAIL_USERNAME=null
|
||||||
MAIL_PASSWORD=null
|
MAIL_PASSWORD=null
|
||||||
|
|
|
@ -12,5 +12,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
Route::get('/', function () {
|
Route::get('/', function () {
|
||||||
|
dd(env('REDIS_PORT'));
|
||||||
return view('welcome');
|
return view('welcome');
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue