fixed conflicts

2022-02-11 15:09:45 +01:00
parent 4823496b58 e3f36ddcfb
commit 685b9cd1fb
11 changed files with 2125 additions and 582 deletions
--- a/linux/fsfwconfig/OBSWConfig.h.in
+++ b/linux/fsfwconfig/OBSWConfig.h.in
@ -61,7 +61,7 @@ debugging. */

 #endif

-#if defined EGSE
+#ifdef EGSE
 #define OBSW_ADD_STAR_TRACKER                      1
 #endif

@ -108,7 +108,7 @@ debugging. */
 #define OBSW_DEBUG_PLOC_SUPERVISOR                  0
 #define OBSW_DEBUG_PDEC_HANDLER	                    0

-#if defined EGSE
+#ifdef EGSE
 #define OBSW_DEBUG_STARTRACKER                      1
 #else
 #define OBSW_DEBUG_STARTRACKER                      0