resolved conflicts in merging with release

This commit is contained in:
Dhanya Maliakal 2016-02-25 14:31:50 +01:00
commit 5b3aa45439

View File

@ -2217,7 +2217,6 @@ dacs_t slsDetector::setDAC(dacs_t val, dacIndex index, int mV, int imod){
char mess[100];
int arg[3];
if ( (thisDetector->myDetectorType != GOTTHARD) && (thisDetector->myDetectorType != PROPIX) && index==HV_POT)
index=HV_NEW;