Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ffdba90e9bd2c0f3a3e551d73ef458462523f2e4 https://github.com/phpmyadmin/phpmyadmin/commit/ffdba90e9bd2c0f3a3e551d73ef4... Author: Michal Čihař michal@cihar.com Date: 2016-01-14 (Thu, 14 Jan 2016)

Changed paths: M libraries/check_user_privileges.lib.php

Log Message: ----------- Fix wrong merge

Signed-off-by: Michal Čihař michal@cihar.com