[phpMyAdmin Git] [phpmyadmin/phpmyadmin] bfb10f: Remove dead code

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: bfb10f57b042f2cd7d7c9f95853e6c5126e1c306
      https://github.com/phpmyadmin/phpmyadmin/commit/bfb10f57b042f2cd7d7c9f95853e6c5126e1c306
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Remove dead code

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 5dd4218df1024577c5b24509b8871bd03bdcc851
      https://github.com/phpmyadmin/phpmyadmin/commit/5dd4218df1024577c5b24509b8871bd03bdcc851
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-10-11 (Sun, 11 Oct 2015)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Fix merge conflict

Signed-off-by: Marc Delisle <marc at infomarc.info>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2d30407b919e...5dd4218df102