merge conflict resolved

This commit is contained in:
2020-04-29 14:17:07 +02:00
parent b7805ae0d4
commit 96ec3b2123
5 changed files with 50 additions and 1 deletions

View File

@ -9,4 +9,5 @@
#define APIJUNGFRAU 0x200409
#define APIMYTHEN3 0x200428
#define APIGOTTHARD2 0x200429
#define APIMOENCH 0x200428
#define APIMOENCH 0x200429