[phpMyAdmin Git] [phpmyadmin/phpmyadmin] d1b99c: Fix merge conflicts

Branch: refs/heads/QA_5_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: d1b99c4a15c151fa601fa1ce4a113dfdfad5aacb https://github.com/phpmyadmin/phpmyadmin/commit/d1b99c4a15c151fa601fa1ce4a1… Author: Maurício Meneghini Fauth <mauricio(a)fauth.dev> Date: 2022-02-11 (Fri, 02 February 2022) -03:00 Changed paths: M libraries/classes/ErrorHandler.php M libraries/classes/Routing.php M psalm-baseline.xml Log Message: ----------- Fix merge conflicts Signed-off-by: Maurício Meneghini Fauth <mauricio(a)fauth.dev>