mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-21 19:30:03 +02:00
solved conflicts
This commit is contained in:
commit
659e204b35
@ -6,6 +6,6 @@
|
||||
#define APIRECEIVER 0x190405
|
||||
#define APIGUI 0x190405
|
||||
#define APIEIGER 0x190516
|
||||
#define APICTB 0x190516
|
||||
|
||||
#define APICTB 0x190514
|
||||
#define APIJUNGFRAU 0x190527
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user