Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix merge issue.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
  • Loading branch information
Tithugues committed Oct 12, 2014
1 parent 2da2c4c commit 2176443
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions libraries/server_status_monitor.lib.php
Expand Up @@ -679,13 +679,8 @@ function PMA_getJsonForLogDataTypeGeneral($start, $end)
// there's been other queries
$temp = $return['rows'][$insertTablesFirst]['argument'];
$return['rows'][$insertTablesFirst]['argument']
<<<<<<< HEAD
.= PMA_getJsonForLogDataTypeGeneral_getSuspensionPoints(
$temp[/*overload*/mb_strlen($temp) - 1]
=======
.= PMA_getSuspensionPoints(
$temp[$pmaString->strlen($temp) - 1]
>>>>>>> master
$temp[/*overload*/mb_strlen($temp) - 1]
);

// Group this value, thus do not add to the result list
Expand Down

0 comments on commit 2176443

Please sign in to comment.