From 5fe8c6e457ced9ad04c8e4f2701a87064f98edb2 Mon Sep 17 00:00:00 2001
From: Anna Bergamaschi <anna.bergamaschi@psi.ch>
Date: Tue, 25 Nov 2014 12:00:08 +0100
Subject: [PATCH] multiSlsDetector merging fixed

---
 slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index f01bd031b..f05164bb1 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -1528,11 +1528,7 @@ slsDetectorDefs::runStatus  multiSlsDetector::getRunStatus() {
       return s;
     }
 
-<<<<<<< HEAD
-  for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) { //loop started from 0, but it's a problem with only one detector...
-=======
   for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
->>>>>>> 5c16b389923487a754e2a4dd64c8da86c901d4e6
     s1=detectors[i]->getRunStatus(); 
     if(detectors[i]->getErrorMask())
       setErrorMask(getErrorMask()|(1<<i));