fixed merged conflict

This commit is contained in:
Zain Fauzan Rofie Azizi
2018-06-12 09:54:54 +08:00
269 changed files with 33220 additions and 94 deletions
+1 -1
View File
@@ -43,7 +43,7 @@ return [
'driver' => 'mysql',
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'forge'),
'database' => env('DB_DATABASE', 'forgzze'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'unix_socket' => env('DB_SOCKET', ''),