solved conflicts

This commit is contained in:
maliakal_d 2019-05-27 15:05:40 +02:00
commit 659e204b35

View File

@ -6,6 +6,6 @@
#define APIRECEIVER 0x190405
#define APIGUI 0x190405
#define APIEIGER 0x190516
#define APICTB 0x190516
#define APICTB 0x190514
#define APIJUNGFRAU 0x190527