mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-21 09:08:00 +02:00
merge conflict
This commit is contained in:
@ -5,9 +5,8 @@
|
||||
#define APIGUI 0x210225
|
||||
#define APICTB 0x210621
|
||||
#define APIGOTTHARD 0x210621
|
||||
#define APIGOTTHARD2 0x210621
|
||||
#define APIJUNGFRAU 0x210621
|
||||
#define APIGOTTHARD2 0x210715
|
||||
#define APIJUNGFRAU 0x210714
|
||||
#define APIMYTHEN3 0x210621
|
||||
#define APIMOENCH 0x210621
|
||||
|
||||
#define APIEIGER 0x210721
|
||||
#define APIEIGER 0x210721
|
||||
|
Reference in New Issue
Block a user