Removing stray version control tags

EBIvariation · May 17, 2018 · 793adfe · 793adfe
1 parent 3e1a7e9
commit 793adfe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/inc/vcf/report_writer.hpp b/inc/vcf/report_writer.hpp
@@ -36,7 +36,7 @@ namespace ebi
             virtual void write_message(const std::string &message) = 0;
             virtual void write_version(ToolVersion tool_version) = 0;
 
-            virtual std::string get_report_message() = 0;
+            virtual std::string get_filename() = 0;
     };
 
     class FileReportWriter : public ReportWriter
@@ -67,18 +67,14 @@ namespace ebi
                 file << message << std::endl;
             }
 
-<<<<<<< HEAD
-            virtual std::string get_report_message() override
-=======
             virtual void write_version(ToolVersion tool_version) override
             {
                 file << tool_version.get_tool_version() << std::endl;
             }
 
             virtual std::string get_filename() override
->>>>>>> 60ef9b9... Reports tool version in DB and report file
             {
-                return "Text report written to : " + file_name;
+                return file_name;
             }
 
         private:
@@ -89,4 +85,4 @@ namespace ebi
 }
 
 
-#endif // VCF_REPORT_WRITER_HPP
+#endif // VCF_REPORT_WRITER_HPP
diff --git a/inc/vcf/summary_report_writer.hpp b/inc/vcf/summary_report_writer.hpp
@@ -93,18 +93,14 @@ namespace ebi
             file << message << std::endl;
         }
 
-<<<<<<< HEAD
-        virtual std::string get_report_message() override
-=======
         virtual void write_version(ToolVersion tool_version) override 
         {
             file << tool_version.get_tool_version() << std::endl;
         }
 
         virtual std::string get_filename() override
->>>>>>> 60ef9b9... Reports tool version in DB and report file
         {
-            return "Summary report written to : " + file_name;
+            return file_name;
         }
 
       private:
@@ -123,4 +119,4 @@ namespace ebi
   }
 }
 
-#endif // VCF_SUMMARY_REPORT_WRITER_HPP
+#endif // VCF_SUMMARY_REPORT_WRITER_HPP