[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 40cc4a: Fix merge issue

26 Mar 2023


      Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 40cc4a0deefb625840660577b8d7d4334fcdff73
https://github.com/phpmyadmin/phpmyadmin/commit/40cc4a0deefb625840660577b8d7...
Author: Maurício Meneghini Fauth <mauricio@fauth.dev>
Date: 2023-03-26 (Sun, 03 March 2023) -03:00

Changed paths: 
M libraries/classes/Util.php
M phpunit.xml.dist
M test/classes/Stubs/DbiDummy.php

Log Message:
-----------
Fix merge issue

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>