From 7ace569daf6e4385fb9084ea7e290b53229111eb Mon Sep 17 00:00:00 2001
From: Dhanya Maliakal <dhanya.maliakal@psi.ch>
Date: Thu, 25 Feb 2016 14:32:56 +0100
Subject: [PATCH] resolved conflicts in merging with release

---
 slsDetectorSoftware/slsDetector/slsDetector.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index aeb5cba3f..641520b18 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -2217,6 +2217,7 @@ 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;