fixed merge conflicts

2021-06-21 17:51:08 +02:00
parent 8d8bb41334 0407aad611
commit ba5832d30e
24 changed files with 269 additions and 57 deletions
--- a/linux/fsfwconfig/returnvalues/classIds.h
+++ b/linux/fsfwconfig/returnvalues/classIds.h
@ -12,8 +12,6 @@
 namespace CLASS_ID {
 enum {
 	CLASS_ID_START = COMMON_CLASS_ID_END,
-	LINUX_LIBGPIO_IF, //LINUXGPIO
-	LINUX_SPI_COM_IF, //LINUXSPI
 	SA_DEPL_HANDLER, //SADPL
 	CLASS_ID_END // [EXPORT] : [END]
 };