Fixed merge conflicts

2025-02-25 18:45:27 -06:00 · 2022-01-08 17:40:49 +01:00
parent a46d510e2b 470c62d993
commit d0c9f5a776
8 changed files with 66 additions and 12 deletions
--- a/config/test/test_config.global.php
+++ b/config/test/test_config.global.php
@@ -55,7 +55,6 @@ $buildDbConnection = static function (): array {
            'user' => 'postgres',
            'password' => 'root',
            'dbname' => 'shlink_test',
-            'charset' => 'utf8',
        ],
        'mssql' => [
            'driver' => 'pdo_sqlsrv',
@@ -71,7 +70,6 @@ $buildDbConnection = static function (): array {
            'user' => 'root',
            'password' => 'root',
            'dbname' => 'shlink_test',
-            'charset' => 'utf8',
        ],
    };
 };