binaries in after merge conflict

This commit is contained in:
maliakal_d 2021-07-01 14:35:29 +02:00
commit 54b9b9938c
2 changed files with 2 additions and 1 deletions

View File

@ -9,4 +9,5 @@
#define APIJUNGFRAU 0x210621 #define APIJUNGFRAU 0x210621
#define APIMYTHEN3 0x210621 #define APIMYTHEN3 0x210621
#define APIMOENCH 0x210621 #define APIMOENCH 0x210621
#define APIEIGER 0x210628
#define APIEIGER 0x210701