merge fix conflict

This commit is contained in:
2021-07-27 17:11:06 +02:00
12 changed files with 39 additions and 17 deletions

View File

@ -3,10 +3,10 @@
#define APILIB 0x210225
#define APIRECEIVER 0x210225
#define APIGUI 0x210225
#define APICTB 0x210722
#define APIGOTTHARD 0x210722
#define APIGOTTHARD2 0x210722
#define APIMYTHEN3 0x210722
#define APIMOENCH 0x210722
#define APIEIGER 0x210722
#define APIJUNGFRAU 0x210723
#define APICTB 0x210727
#define APIGOTTHARD 0x210727
#define APIGOTTHARD2 0x210727
#define APIJUNGFRAU 0x210727
#define APIMYTHEN3 0x210727
#define APIMOENCH 0x210727
#define APIEIGER 0x210727