Re #19951: Fixed leftover merge conflict.

qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h

@@ -316,10 +316,7 @@ private:
   void afterReplaceHandle(const std::string &name,
                           Mantid::API::Workspace_sptr workspace) override;
   void saveNotebook(const TreeData &data);
-<<<<<<< HEAD
   std::vector<std::unique_ptr<Command>> getTableList();
-=======
-  std::vector<std::unique_ptr<DataProcessorCommand>> getTableList();
 
   // set/get values in the table
   void setCell(int row, int column, int parentRow, int parentColumn,
@@ -328,7 +325,6 @@ private:
                       int parentColumn) override;
   int getNumberOfRows() override;
   void clearTable() override;
->>>>>>> master
 };
 }
 }