[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e7bc50: Fix merge conflict