fixed conflicts

2021-07-23 18:04:51 +02:00
parent a2e62b28c3
commit 0ce55d5e62
3 changed files with 4 additions and 4 deletions
--- a/linux/fsfwconfig/OBSWConfig.h.in
+++ b/linux/fsfwconfig/OBSWConfig.h.in
@ -49,7 +49,7 @@ debugging. */
 #define IMTQ_DEBUG                      1
 #define RW_DEBUG                        0
 #define START_TRACKER_DEBUG             0
-#define PLOC_MPSOC_DEBUG	            1
+#define PLOC_MPSOC_DEBUG	            0
 #define PLOC_SUPERVISOR_DEBUG           1

 // Leave at one as the BSP is linux. Used by the ADIS16507 device handler