From 7574a640bd29cd3aeac13071de1bf3c6899ffbdf Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Tue, 10 Aug 2021 09:19:43 +0200
Subject: [PATCH 1/2] merge bug fix

---
 slsSupportLib/include/sls/ToString.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/slsSupportLib/include/sls/ToString.h b/slsSupportLib/include/sls/ToString.h
index 3dffb042d..d40b02ab9 100644
--- a/slsSupportLib/include/sls/ToString.h
+++ b/slsSupportLib/include/sls/ToString.h
@@ -36,13 +36,9 @@ std::string ToString(const defs::dacIndex s);
 std::string ToString(const std::vector<defs::dacIndex> &vec);
 std::string ToString(const defs::burstMode s);
 std::string ToString(const defs::timingSourceType s);
-<<<<<<< HEAD
 std::string ToString(const defs::M3_GainCaps s);
 std::string ToString(const defs::portPosition s);
-std::string ToString(const defs::ethernetInterface s);
-=======
 std::string ToString(const defs::streamingInterface s);
->>>>>>> 5.2.0-rc
 std::string ToString(const defs::vetoAlgorithm s);
 
 std::string ToString(const slsDetectorDefs::xy &coord);

From 7700be7df1685c0d6854ddaf0e983d662236dc12 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Tue, 10 Aug 2021 09:20:40 +0200
Subject: [PATCH 2/2] binaries in

---
 .../bin/ctbDetectorServer_developer           | Bin 270204 -> 270204 bytes
 .../bin/eigerDetectorServer_developer         | Bin 378367 -> 378367 bytes
 .../bin/gotthard2DetectorServer_developer     | Bin 229336 -> 229336 bytes
 .../bin/gotthardDetectorServer_developer      | Bin 220048 -> 220048 bytes
 .../bin/jungfrauDetectorServer_developer      | Bin 236120 -> 236120 bytes
 .../bin/moenchDetectorServer_developer        | Bin 257716 -> 257716 bytes
 .../bin/mythen3DetectorServer_developer       | Bin 242696 -> 242696 bytes
 slsSupportLib/include/sls/versionAPI.h        |  14 +++++++-------
 8 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
index 8d0cf5c284422eb2d7a50b5482b00b1e8b52c8a2..514e553958a007f1e5bae8f494e4087d6f13a074 100755
GIT binary patch
delta 53
zcmeyfPvFl!feD(-LK@4bGlnrsY;;+{$tW=SEvGo6z-CsiP#Z>p=4iL}Xg5Y6X4)R@
I#;kY~0O(r~(*OVf

delta 53
zcmeyfPvFl!feD(-yw2v+8N-+*HoC0fWMrHCmQ$ROZ8IxZs0|}qbF^D~v>PK3Gi{G{
IV^+Kg0M^71TL1t6

diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
index 4761c380df33f6ee311417979299dfc500d595f2..18c12fa5458fad68a55d2090b506e224032d6bbe 100755
GIT binary patch
delta 60
zcmez0E&jh-d;_x-qrmhFY>ZNq-${x>nazGu+x?^%Gn*I%+IP%h1Y#y2W(H!G?K|eM
Hx@!Uej64<Y

delta 60
zcmez0E&jh-d;_x-Bir-~Y>ZNq-${x>nazGu+x?^%Gn*LM+IP%h1Y#y2W(H!G?K|eM
Hx@!Uehujs=

diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
index 0c07d324107c16c4bf0050d8f33835a40b110d8b..86f1b7fb62364cb5a274bf0939f9ef4dc9ba2aa0 100755
GIT binary patch
delta 44
ycmccdpZCUp-VH9wOe`#u>y*_e=PL69nVajBv!(&*=2tu0U+rYv{%R-FyQ2Vn_!2(=

delta 44
ycmccdpZCUp-VH9wOf8I)>y*_e=PL69nVajBv!(&*=2tu0U+rYv{%R-FyQ2W0DHFB;

diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
index 46176904234fdd3974de992aa68626c2948fac8e..5bc77a6cd6099409bce7292bfb1778e78182fa93 100755
GIT binary patch
delta 53
zcmbQRop%BdX)+6GteF0B1Czu?mmCg8fyo;=#2E!PpX8Wmz$nlhZP^}e$q2+u+oLU+
GO_c!f77)?^

delta 53
zcmbQRop%BdX)^OVn@|6^fk|ScOAZGk+vJTL;*4yYPjXB&U}S5Kwrr2KWCUWS?a`LZ
Grb+<bRS;PK

diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
index 0497e605dd58eb610dae57484424fa450eac7fb0..09de7814429656c69dd41eb30863a97c52421835 100755
GIT binary patch
delta 71
zcmcbyh401|z6qMlLK>^57d~T>*ytj_At}JYn85ggfkA))41g?$hl&gg4+S>oa_AZ}
W3N+8QZl7(<2*ga=XInGxjROGnx)kdG

delta 71
zcmcbyh401|z6qMlyv|nB3!gDbY;+OekYwXvOkjM$z#zZ?20)g>Lq!ILhisd3IdqK~
W*_vltx6ig_1Y)M`v#pu;#sL7_-xP8H

diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
index b601701b96cdf12052ce491c06515a444dbc8b41..2e9455217a62a1075031ac7a4c14b207f4b27de4 100755
GIT binary patch
delta 53
zcmdmTmw(G${t24QLK<tQf7D@?*yyr?lTl#uTTXFCfz7O3md1<%&GxqK_O^^b%(UI!
Imbr8z0PemJz5oCK

delta 53
zcmdmTmw(G${t24Qyv{b$Kk6_`Y;;+{$;dYOEvGmm+h$fSOJhd1W_#Oqds{{zX4-CV
I%Urq<0Nni$MF0Q*

diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
index 31fb66e8d972964e05cb3d2a22248671b2b4544f..3b3057a24e36602b468883f3bd8c8c48ebc64eef 100755
GIT binary patch
delta 48
zcmeBp!PoJEZ-a<36AQ~^KV|jFw#xiK=4L--zI-6v95<;wZW1F9Gi{HX#Joxo0Ab+{
AsQ>@~

delta 48
zcmeBp!PoJEZ-a<3Qw!r{KV|jFw#xiK=4L--zI-6v95<;wZW1F9Gi{HX#Joxo0E+Gq
AAOHXW

diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h
index b89933f47..b1f2968a6 100644
--- a/slsSupportLib/include/sls/versionAPI.h
+++ b/slsSupportLib/include/sls/versionAPI.h
@@ -3,10 +3,10 @@
 #define APILIB       0x210225
 #define APIRECEIVER  0x210225
 #define APIGUI       0x210225
-#define APICTB 0x210806
-#define APIGOTTHARD 0x210806
-#define APIGOTTHARD2 0x210806
-#define APIJUNGFRAU 0x210806
-#define APIMYTHEN3 0x210806
-#define APIMOENCH 0x210806
-#define APIEIGER 0x210806
+#define APICTB 0x210810
+#define APIGOTTHARD 0x210810
+#define APIGOTTHARD2 0x210810
+#define APIJUNGFRAU 0x210810
+#define APIMYTHEN3 0x210810
+#define APIMOENCH 0x210810
+#define APIEIGER 0x210810