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_replication.php | |
| parent | b07df013406426c41ec388fac679c807db4af64a (diff) | |
| parent | 920d827c37f4aee7dac6479f9f51488ee6fb4c73 (diff) | |
Fix merge conflicts
Diffstat (limited to 'server_replication.php')
| -rw-r--r-- | server_replication.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server_replication.php b/server_replication.php index bf17e24396..70e6b4fb18 100644 --- a/server_replication.php +++ b/server_replication.php @@ -294,7 +294,7 @@ if (! isset($GLOBALS['repl_clear_scr'])) { echo '<br />'; echo '<ul>'; echo ' <li><a href="#" id="slave_status_href">' . __('See slave status table') . '</a>'; - echo PMA_replication_print_status_table('slave', true, false); + PMA_replication_print_status_table('slave', true, false); echo ' </li>'; echo ' <li><a href="#" id="slave_control_href">' . __('Control slave:') . '</a>'; |