conflict solved and merged with developer

This commit is contained in:
maliakal_d 2020-09-09 10:27:14 +02:00
commit bdac4d133e
2 changed files with 2 additions and 1 deletions

View File

@ -6,7 +6,8 @@
#define APIEIGER 0x200908 #define APIEIGER 0x200908
#define APICTB 0x200908 #define APICTB 0x200908
#define APIGOTTHARD 0x200908 #define APIGOTTHARD 0x200908
#define APIGOTTHARD2 0x200908
#define APIJUNGFRAU 0x200908 #define APIJUNGFRAU 0x200908
#define APIMYTHEN3 0x200908 #define APIMYTHEN3 0x200908
#define APIMOENCH 0x200908 #define APIMOENCH 0x200908
#define APIGOTTHARD2 0x200909