fixed merge conflicts

2021-07-23 17:48:11 +02:00
parent 0cc454d891 62fe0571b1
commit a2e62b28c3
70 changed files with 1597 additions and 606 deletions
--- a/linux/fsfwconfig/OBSWConfig.h.in
+++ b/linux/fsfwconfig/OBSWConfig.h.in
@ -32,7 +32,7 @@ debugging. */
 #define ADD_PLOC_SUPERVISOR             1
 #define ADD_PLOC_MPSOC	                0

-#define TE0720                          0
+#define BOARD_TE0720                    0
 #define TE0720_HEATER_TEST              0

 #define P60DOCK_DEBUG                   0