conflict resolved from merge developer to gappixels insignificant

This commit is contained in:
Dhanya Maliakal 2017-11-10 16:54:18 +01:00
commit 678ef89e17

View File

@ -6517,6 +6517,7 @@ int slsDetector::configureMAC(){
}
}
//if udpip wasnt initialized in config file
if(!(strcmp(thisDetector->receiverUDPIP,"none"))){
//hostname is an ip address