fixing conflics after merging back release to developer

2025-06-22 01:27:59 +02:00 · 2021-03-23 10:50:09 +01:00
parent e8fe203940 2f2fe4dd47
commit 60e3fb8aab
33 changed files with 836 additions and 293 deletions
--- a/slsDetectorServers/eigerDetectorServer/bin/config_eiger.txt
+++ b/slsDetectorServers/eigerDetectorServer/bin/config_eiger.txt
@ -0,0 +1,2 @@
+top 1
+master 1
--- a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_5.1.0
+++ b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_5.1.0
--- a/slsDetectorServers/eigerDetectorServer/bin/hv9m_blackfin_serverv3.0.0.1
+++ b/slsDetectorServers/eigerDetectorServer/bin/hv9m_blackfin_serverv3.0.0.1