[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 18b7a2: Fix corrupted file caused by wrong merge