Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e7bc5043871f35dafaf1e9008c75f95ab447274f https://github.com/phpmyadmin/phpmyadmin/commit/e7bc5043871f35dafaf1e9008c75... Author: Maurício Meneghini Fauth <mauricio@fauth.dev> Date: 2023-03-04 (Sat, 03 March 2023) -03:00 Changed paths: M js/src/modules/themes-manager.js Log Message: ----------- Fix merge conflict Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>