mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-01-16 14:39:00 +01:00
fixing conflics after merging back release to developer
This commit is contained in:
2
slsDetectorServers/eigerDetectorServer/bin/config_eiger.txt
Executable file
2
slsDetectorServers/eigerDetectorServer/bin/config_eiger.txt
Executable file
@@ -0,0 +1,2 @@
|
||||
top 1
|
||||
master 1
|
||||
BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_5.1.0
Executable file
BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_5.1.0
Executable file
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user