From e79e4e701413f29f488bcb29ff77def33df05709 Mon Sep 17 00:00:00 2001
From: Hollos Roland <hollorol@gmail.com>
Date: Wed, 1 Jun 2022 10:28:10 +0200
Subject: [PATCH] really fix merge conflict

---
 RBBGCMuso/R/multiSite.R | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/RBBGCMuso/R/multiSite.R b/RBBGCMuso/R/multiSite.R
index 984c4fc..5627021 100644
--- a/RBBGCMuso/R/multiSite.R
+++ b/RBBGCMuso/R/multiSite.R
@@ -171,15 +171,8 @@ multiSiteCalib <- function(measurements,
                                   result <- multiSiteThread(measuredData = measurements, parameters = parameters, calTable=calTable, 
                                                    dataVar = dataVar, iterations = threadCount[i],
                                                    likelihood = likelihood, threadNumber= i, constraints=constraints, th=th)
-<<<<<<< HEAD
-                                   ##setwd("../")
-                               }
-
-                      , error = function(e){
-                                  
-=======
-                                   setwd("../../")
-                                   return(result)
+                                   # setwd("../../")
+                                   # return(result)
                                }
 
                       , error = function(e){
@@ -187,7 +180,6 @@ multiSiteCalib <- function(measurements,
                                             sink("error.txt")
                                             print(e)
                                             sink()
->>>>>>> origin/CIRM
                                             saveRDS(e,"error.RDS")
                                             writeLines(as.character(iterations),"progress.txt")
                                         })