fixed conflicts

2021-06-21 18:01:23 +02:00
parent ba5832d30e a2255e2cfe
commit 49c7b3fd45
421 changed files with 6 additions and 33050 deletions
--- a/linux/fsfwconfig/FSFWConfig.h.in
+++ b/linux/fsfwconfig/FSFWConfig.h.in
@ -72,6 +72,6 @@ static constexpr size_t FSFW_MAX_TM_PACKET_SIZE = 2048;

 }

-#define FSFW_HAL_LINUX_SPI_WIRETAPPING  1
+#define FSFW_HAL_LINUX_SPI_WIRETAPPING  0

 #endif /* CONFIG_FSFWCONFIG_H_ */