merge conflict fixed and merged with developer

This commit is contained in:
2020-09-09 12:31:36 +02:00
9 changed files with 11 additions and 9 deletions

View File

@ -3,10 +3,11 @@
#define APILIB 0x200810
#define APIRECEIVER 0x200810
#define APIGUI 0x200804
#define APIEIGER 0x200908
#define APICTB 0x200908
#define APIGOTTHARD 0x200908
#define APIGOTTHARD2 0x200908
#define APIJUNGFRAU 0x200908
#define APIMOENCH 0x200908
#define APIMYTHEN3 0x200908
#define APICTB 0x200909
#define APIGOTTHARD 0x200909
#define APIGOTTHARD2 0x200909
#define APIJUNGFRAU 0x200909
#define APIMOENCH 0x200909
#define APIEIGER 0x200909
#define APIMYTHEN3 0x200909