binaries in

slsdetectorgroup · Feb 24, 2023 · 21db57d · 21db57d
1 parent dc5db90
commit 21db57d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 22 deletions.
diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h
@@ -1,26 +1,13 @@
 // SPDX-License-Identifier: LGPL-3.0-or-other
 // Copyright (C) 2021 Contributors to the SLS Detector Package
 /** API versions */
-<<<<<<< HEAD
 #define RELEASE     "developer"
-#define APILIB      "developer 0x221213"
-#define APIRECEIVER "developer 0x221213"
-#define APICTB       "developer 0x221213"
-#define APIGOTTHARD2 "developer 0x221213"
-#define APIJUNGFRAU  "developer 0x221213"
-#define APIEIGER "developer 0x221215"
-#define APIMOENCH    "developer 0x221215"
-#define APIGOTTHARD "developer 0x230117"
-#define APIMYTHEN3 "developer 0x230117"
-=======
-#define RELEASE      "7.0.0"
-#define APICTB       "7.0.0 0x230222"
-#define APIGOTTHARD  "7.0.0 0x230222"
-#define APIGOTTHARD2 "7.0.0 0x230222"
-#define APIJUNGFRAU  "7.0.0 0x230222"
-#define APIMYTHEN3   "7.0.0 0x230222"
-#define APIMOENCH    "7.0.0 0x230222"
-#define APIEIGER     "7.0.0 0x230222"
-#define APILIB       "7.0.0 0x230223"
-#define APIRECEIVER  "7.0.0 0x230222"
->>>>>>> 7.0.0.rc
+#define APICTB "developer 0x230224"
+#define APIGOTTHARD "developer 0x230224"
+#define APIGOTTHARD2 "developer 0x230224"
+#define APIJUNGFRAU "developer 0x230224"
+#define APIMYTHEN3 "developer 0x230224"
+#define APIMOENCH "developer 0x230224"
+#define APIEIGER "developer 0x230224"
+#define APILIB "developer 0x230224"
+#define APIRECEIVER "developer 0x230224"