MDL-72095 survey: Resolve merge conflict properly.
This commit is contained in:
@@ -75,10 +75,6 @@ if ($surveyalreadydone && $showscales) {
|
||||
$PAGE->activityheader->set_description('');
|
||||
}
|
||||
$PAGE->add_body_class('limitedwidth');
|
||||
echo $OUTPUT->header();
|
||||
if (!$PAGE->has_secondary_navigation()) {
|
||||
echo $OUTPUT->heading(format_string($survey->name));
|
||||
}
|
||||
|
||||
echo $OUTPUT->header();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user