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
This commit is contained in:
l_maliakal_d
2012-03-16 15:24:12 +00:00
parent 6a49d8a6df
commit 7b3bc86678

View File

@ -3218,7 +3218,6 @@ int multiSlsDetector::retrieveDetectorSetup(string const fname1, int level){
return OK;
int multiSlsDetector::testFunction(int times) {
return OK;