From 34f10b382e244e5d38ba0644e468566c30bac983 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 3 Oct 2017 15:01:30 +0200 Subject: [PATCH] one more conflict resolved from mergin with 3.0.1 (silent mode, this had changes for zmq source ip) --- slsDetectorSoftware/commonFiles/error_defs.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/slsDetectorSoftware/commonFiles/error_defs.h b/slsDetectorSoftware/commonFiles/error_defs.h index 5428db053..ec59cd6a3 100644 --- a/slsDetectorSoftware/commonFiles/error_defs.h +++ b/slsDetectorSoftware/commonFiles/error_defs.h @@ -262,16 +262,15 @@ public: if(slsErrorMask&RECEIVER_FILE_FORMAT) retval.append("Could not set receiver file format\n"); -<<<<<<< HEAD if(slsErrorMask&RECEIVER_TIMER_NOT_SET) retval.append("Could not set timer in receiver.\n"); -======= + if(slsErrorMask&RECEIVER_SUBF_TIME_NOT_SET) retval.append("Could not set sub exposure time in receiver.\n"); if(slsErrorMask&RECEIVER_SILENT_MODE_NOT_SET) retval.append("Could not set silent mode in receiver.\n"); ->>>>>>> 3.0.1 + //------------------------------------------------------ length of message