detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-20 08:38:00 +02:00
Code Issues Actions Packages Releases Activity

merge conflict fix

Browse Source
This commit is contained in:
maliakal_d
2021-07-22 13:52:55 +02:00
parent 05b7e0ef42 97ff58c978
commit 5b05a30287
5 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsSupportLib/include/sls/versionAPI.h
View File

@ -5,8 +5,8 @@
#define APIGUI 0x210225
#define APICTB 0x210621
#define APIGOTTHARD 0x210621
#define APIGOTTHARD2 0x210721
#define APIJUNGFRAU 0x210714
#define APIGOTTHARD2 0x210722
#define APIJUNGFRAU 0x210722
#define APIMYTHEN3 0x210621
#define APIMOENCH 0x210621
#define APIEIGER 0x210721