[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f3c289: Fix merge conflict