From d30776ffbf42088aeb51acb6feb638bc11ace622 Mon Sep 17 00:00:00 2001
From: Hollos Roland <hollos.roland@agrar.atk>
Date: Wed, 11 May 2022 18:23:13 +0200
Subject: [PATCH] fix mergeconflict

---
 RBBGCMuso/R/multiSite.R | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/RBBGCMuso/R/multiSite.R b/RBBGCMuso/R/multiSite.R
index bdbc357..984c4fc 100644
--- a/RBBGCMuso/R/multiSite.R
+++ b/RBBGCMuso/R/multiSite.R
@@ -304,12 +304,9 @@ multiSiteCalib <- function(measurements,
     
     res[["calibrationPar"]] <- calibrationPar
     res[["parameters"]] <- parameters
-<<<<<<< HEAD
     # browser()
     res[["comparison"]] <- compareCalibratedWithOriginal(key = names(dataVar)[1], modOld=origModOut, modNew=aposteriori, mes=measurements,
-=======
-    res[["comparison"]] <- compareCalibratedWithOriginal(key = names(dataVar), modOld=origModOut, modNew=aposteriori, mes=measurements,
->>>>>>> origin/CIRM
+
                                                                  likelihoods = likelihood,
                                                                  alignIndexes = alignIndexes,
                                                                  musoCodeToIndex = musoCodeToIndex,