From 9d131075ad6c93d152a7a46c7730d38133324d31 Mon Sep 17 00:00:00 2001
From: Stephane Plaszczynski <plaszczy@lal.in2p3.fr>
Date: Fri, 28 Jun 2019 17:06:39 +0200
Subject: [PATCH] stupid merge

---
 src/camel/MCMC/exec/mainMCMC.cc | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/camel/MCMC/exec/mainMCMC.cc b/src/camel/MCMC/exec/mainMCMC.cc
index 89add12..f3f46ee 100644
--- a/src/camel/MCMC/exec/mainMCMC.cc
+++ b/src/camel/MCMC/exec/mainMCMC.cc
@@ -50,19 +50,13 @@ int main(int argc, char *argv[])
     std::cout << "output file " + fileName + " already exists: removing it"<<endl;
     remove_file(fileName);
   }
-<<<<<<< HEAD
   string base=BaseName(fileName);
 
   string ar_file=string("ar_vs_length_")+base;
   string scale_file=string("scale_")+base;
   string cor_file=string("last_step_")+base;
-=======
-  string ar_file=string("ar_vs_length_")+fileName;
-  string scale_file=string("scale_")+fileName;
-  string cor_file=string("last_step_")+fileName;
->>>>>>> 3399f7a40aaa872fc3de1dde13916af714ef0568
 
-  cout << "output files:" <<endl;
+  cout << "MCMC output files:" <<endl;
   cout << ar_file << " " << scale_file << " " << cor_file << " " << endl;
 
   cout << "output files:" <<endl;
-- 
GitLab