From 7b3bc86678788b63317bd91b5aa9019384cdf179 Mon Sep 17 00:00:00 2001
From: l_maliakal_d <l_maliakal_d@951219d9-93cf-4727-9268-0efd64621fa3>
Date: Fri, 16 Mar 2012 15:24:12 +0000
Subject: [PATCH] a weird merge had a return ok in the end of retreievedetector

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@150 951219d9-93cf-4727-9268-0efd64621fa3
---
 slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index 0c5a5e80f..030fe43a3 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -3218,7 +3218,6 @@ int multiSlsDetector::retrieveDetectorSetup(string const fname1, int level){
 
 
 
-  return OK;
 
 int multiSlsDetector::testFunction(int times) {
   return OK;