diff --git a/classes/port-display.php b/classes/port-display.php index 5c576537..354b2c8c 100644 --- a/classes/port-display.php +++ b/classes/port-display.php @@ -49,6 +49,19 @@ class port_display { var $ShowWatchListCount; var $ShowWatchListStatus; + function htmlConflicts($conflicts) { + $HTML = ''; + + $HTML .= "\n"; + + return $HTML; + } + function SetPort($port, $branch = BRANCH_HEAD) { // // We could derived branch from element_pathname(port->element_id) but let's try passing in branch explicity. @@ -632,21 +645,21 @@ function Display($verbosity_level = 1) { $HTML .= "Conflicts:\n\n";