From 5db41680a44a7621ae6125c04d4f4751708450c2 Mon Sep 17 00:00:00 2001 From: Dan Parsons <108939145+SchistoDan@users.noreply.github.com> Date: Wed, 24 Sep 2025 10:50:45 +0100 Subject: [PATCH] Update MitoGeneExtractor.cpp Fix unresolved conflict merging that resulted in a make error when compiling. --- MitoGeneExtractor.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/MitoGeneExtractor.cpp b/MitoGeneExtractor.cpp index f6a46ea..ed064eb 100644 --- a/MitoGeneExtractor.cpp +++ b/MitoGeneExtractor.cpp @@ -1767,11 +1767,7 @@ int main(int argc, char **argv) if (global_verbosity >= 3) { -<<<<<<< HEAD - cout << "PROGRESS: Finished reading input DNA sequences. Found this number of input DNA sequences: " -======= cerr << "PROGRESS: Finished reading input DNA sequences. Found this number of input DNA sequences: " ->>>>>>> refactor-bugfix-v1.9.6 << seqs_DNA_reads_target.GetTaxaNum() << endl; }