From 275bb74193f71837d638c05fb40bc9b53a749f27 Mon Sep 17 00:00:00 2001
From: kdc715 <kedic715@gmail.com>
Date: Thu, 20 Jan 2022 10:53:41 +0100
Subject: [PATCH] fix conflict after merge
---
src/argument_parsing.h | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/src/argument_parsing.h b/src/argument_parsing.h
index 27fb617..1d7c375 100644
--- a/src/argument_parsing.h
+++ b/src/argument_parsing.h
@@ -1407,26 +1407,6 @@ ArgumentParser::ParseResult checkInput(MergeSetMateOptions & options){
std::cerr << "ERROR: Path to sample directories \'" << options.prefix << "\' does not exist." << std::endl;
res = ArgumentParser::PARSE_ERROR;
}
-<<<<<<< HEAD
- CharString filename = options.prefix;
- filename += "/";
- filename += options.sampleID;
- filename += "/";
- filename += options.nonRefBam;
- if (!exists(filename))
- {
- std::cerr << "ERROR: Input BAM file \'" << filename << "\' does not exist." << std::endl;
- res = ArgumentParser::PARSE_ERROR;
- }
- filename = options.prefix;
- filename += "/";
- filename += options.sampleID;
- filename += "/";
- filename += options.remappedBam;
- if (!exists(filename))
- {
- std::cerr << "ERROR: Input BAM file \'" << filename << "\' does not exist." << std::endl;
-=======
CharString filenameNonRefBam = options.prefix;
filenameNonRefBam += "/";
@@ -1449,7 +1429,6 @@ ArgumentParser::ParseResult checkInput(MergeSetMateOptions & options){
if (!exists(filenameRemappedBam))
{
std::cerr << "ERROR: Input BAM file \'" << filenameRemappedBam << "\' does not exist." << std::endl;
->>>>>>> 3c91fa0fb1120cec92e7feb76afce165d0e62af0
res = ArgumentParser::PARSE_ERROR;
}
@@ -1810,3 +1789,4 @@ seqan::ArgumentParser::ParseResult parseCommandLine(TOptions &options, int argc,
#endif /*ARGUMENT_PARSING_H_*/
+
--
GitLab