diff --git a/slsDetectorSoftware/commonFiles/communication_funcs.c b/slsDetectorSoftware/commonFiles/communication_funcs.c index 4c19812ed..ab37c8996 100755 --- a/slsDetectorSoftware/commonFiles/communication_funcs.c +++ b/slsDetectorSoftware/commonFiles/communication_funcs.c @@ -328,15 +328,9 @@ int receiveData(int file_des, void* buf,int length, intType itype){ int nreceiving; int nreceived; if (file_des<0) return -1; -<<<<<<< HEAD - #ifdef VERY_VERBOSE - printf("want to receive %d Bytes\n", length); - #endif -======= #ifdef VERY_VERBOSE printf("want to receive %d Bytes\n", length); #endif ->>>>>>> e564542ad33a64e66ad6153066741c69c707f99d while(length > 0) { nreceiving = (length>send_rec_max_size) ? send_rec_max_size:length;