fix the worse merge ever undertaken again

Author: MialLewis

qt/scientific_interfaces/ISISReflectometry/test/RunsTable/RunsTablePresenterDisplayTest.h

@@ -7,7 +7,6 @@
 #pragma once
 
 #include "../../../ISISReflectometry/GUI/RunsTable/RunsTablePresenter.h"
-#include "../../../ISISReflectometry/TestHelpers/PlottingTestHelpers.h"
 #include "RunsTablePresenterTest.h"
 
 #include <cxxtest/TestSuite.h>

qt/scientific_interfaces/ISISReflectometry/test/Save/SavePresenterTest.h

@@ -37,9 +37,9 @@ class SavePresenterTest : public CxxTest::TestSuite {
   static void destroySuite(SavePresenterTest *suite) { delete suite; }
 
   SavePresenterTest()
-      : m_view(), m_savePath("/foo/bar/"), m_fileFormat(NamedFormat::Custom), m_metaSource(ORSOMetaSource::History),
-        m_prefix("testoutput_"), m_includeHeader(true), m_separator(","), m_includeQResolution(true),
-        m_includeAdditionalColumns(false), m_model(""), m_validation(false) {}
+      : m_view(), m_savePath("/foo/bar/"), m_fileFormat(NamedFormat::Custom), m_prefix("testoutput_"),
+        m_includeHeader(true), m_separator(","), m_includeQResolution(true), m_includeAdditionalColumns(false),
+        m_model(""), m_validation(false) {}
 
   void tearDown() override {
     // Verifying and clearing of expectations happens when mock variables are destroyed.