[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 4e5b08: Fix errors introduced by wrongly merging

1 Mar 2016


      Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 4e5b08e26cc20ca89ab1b3639cf15d1d7470ae5d
      https://github.com/phpmyadmin/phpmyadmin/commit/4e5b08e26cc20ca89ab1b3639cf1...
  Author: Michal Čihař <michal@cihar.com>
  Date:   2016-03-01 (Tue, 01 Mar 2016)

  Changed paths:
    M templates/database/structure/sortable_header.phtml

  Log Message:
  -----------
  Fix errors introduced by wrongly merging

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