detectors/slsDetectorPackage
24
1 Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-11-11 20:03:53 +01:00
Code Issues Actions Packages Releases Activity

conflict fix

Browse Source
This commit is contained in:
maliakal_d committed 2020-03-04 13:51:58 +01:00
2 parents e143204ce1 5f3af794ce
commit 042e5715e6
2 files changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
BIN
View File
Binary file not shown.
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
+1 -1
View File
@@ -3941,7 +3941,7 @@ int power_chip(int file_des) {
return printSocketReadError();
FILE_LOG(logDEBUG1, ("Powering chip to %d\n", arg));
#if !defined(JUNGFRAUD) && !defined(MYTHEN3D) && !defined(GOTTHARD2D)
#if !defined(JUNGFRAUD) && !defined(MOENCHD) && !defined(MYTHEN3D) && !defined(GOTTHARD2D)
functionNotImplemented();
#else
// set & get