diff options
author | Marc Delisle <marc@infomarc.info> | 2013-05-15 21:07:22 +0400 |
---|---|---|
committer | Marc Delisle <marc@infomarc.info> | 2013-05-15 21:07:22 +0400 |
commit | d44367e4db0010cde0a1b6c4a2f028610bf87ab7 (patch) | |
tree | a0bbeb16fd6ca4a3d57d6b620c8731072a32d903 /server_status_advisor.php | |
parent | b07df013406426c41ec388fac679c807db4af64a (diff) | |
parent | 920d827c37f4aee7dac6479f9f51488ee6fb4c73 (diff) |
Fix merge conflicts
Diffstat (limited to 'server_status_advisor.php')
-rw-r--r-- | server_status_advisor.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server_status_advisor.php b/server_status_advisor.php index c375234b16..ae26d2a234 100644 --- a/server_status_advisor.php +++ b/server_status_advisor.php @@ -17,7 +17,7 @@ if (PMA_DRIZZLE) { include_once 'libraries/replication_gui.lib.php'; } -$ServerStatusData = new PMA_ServerStatusData('server_status_advisor.php'); +$ServerStatusData = new PMA_ServerStatusData(); $response = PMA_Response::getInstance(); $scripts = $response->getHeader()->getScripts(); |