KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reset back config/database to default ujrah_master branch

Browse Source
This commit is contained in:
Afiq Hamzah
2024-01-07 15:37:13 +08:00
parent f0cece46c7
commit 6b7ffba7cb
1 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/database.php
-26
View File
@@ -17,7 +17,6 @@ return [
'prefix' => '',
'strict' => false,
],
<<<<<<< Updated upstream
'mysql37' => [
'driver' => 'mysql',
'host' => env('DB_HOST_37'),
@@ -30,8 +29,6 @@ return [
'prefix' => '',
'strict' => false,
],
=======
>>>>>>> Stashed changes
'mysql2' => [
'driver' => 'mysql',
'host' => env('DB_HOST_2'),
@@ -428,23 +425,7 @@ return [
'prefix' => '',
'strict' => false,
],
<<<<<<< Updated upstream
'mysql34' => [
=======
'mysql36' => [
'driver' => 'mysql',
'host' => env('DB_HOST_36'),
'port' => env('DB_PORT_36'),
'database' => env('DB_DATABASE_36'),
'username' => env('DB_USERNAME_36'),
'password' => env('DB_PASSWORD_36'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql34' => [
>>>>>>> Stashed changes
'driver' => 'mysql',
'host' => env('DB_HOST_34'),
'port' => env('DB_PORT_34'),
@@ -456,11 +437,7 @@ return [
'prefix' => '',
'strict' => false,
],
<<<<<<< Updated upstream
'mysql35' => [
=======
'mysql35' => [
>>>>>>> Stashed changes
'driver' => 'mysql',
'host' => env('DB_HOST_35'),
'port' => env('DB_PORT_35'),
@@ -471,7 +448,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
<<<<<<< Updated upstream
],
'mysql36' => [
'driver' => 'mysql',
@@ -496,8 +472,6 @@ return [
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
=======
>>>>>>> Stashed changes
],
],
];