mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-23 15:00:02 +02:00
conflict resolved from merge developer to gappixels insignificant
This commit is contained in:
commit
678ef89e17
@ -6517,6 +6517,7 @@ int slsDetector::configureMAC(){
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//if udpip wasnt initialized in config file
|
||||
if(!(strcmp(thisDetector->receiverUDPIP,"none"))){
|
||||
//hostname is an ip address
|
||||
|
Loading…
x
Reference in New Issue
Block a user