binaries in after merge

RELEASE.txt

@@ -26,7 +26,11 @@ This document describes the differences between v6.1.0 and v6.0.0.
 - refactoring (rxr)
 - fixed patsetbit and patsetmask for moench
 - changed default vref of adc9257 to 2V for moench (from 1.33V)
+<<<<<<< HEAD
 - moench and ctb - can set the starting frame number of next acquisition
+=======
+- mythen server kernel check incompatible (cet timezone)
+>>>>>>> developer
 
 
 

slsDetectorServers/slsDetectorServer/src/common.c

@@ -76,6 +76,11 @@ int getTimeFromString(char *buf, time_t *result) {
     LOG(logDEBUG, ("kernel v %s\n", buffer));
     const char *timezone = {"CEST"};
     char *res = strstr(buffer, timezone);
+    // remove CET as well
+    if (res == NULL) {
+        strcpy(timezone, "CET");
+        res = strstr(buffer, timezone);
+    }
     if (res != NULL) {
         size_t cestPos = res - buffer;
         size_t pos = cestPos + strlen(timezone) + 1;