From 6fa68a1aa8a6cceef7b324f603cbe3ac040a45be Mon Sep 17 00:00:00 2001
From: Ilya Tregubov <ilya@moodle.com>
Date: Tue, 14 Dec 2021 08:10:45 +0200
Subject: [PATCH] MDL-72095 survey: Resolve merge conflict properly.

---
 mod/survey/view.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mod/survey/view.php b/mod/survey/view.php
index 4424fba3a97..9a1a70a1bd8 100644
--- a/mod/survey/view.php
+++ b/mod/survey/view.php
@@ -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();