fixed merge conflicts

2021-07-01 18:25:40 +02:00
parent 0e9c1831ed e9395e90c5
commit 9f6378f001
27 changed files with 381 additions and 113 deletions
--- a/linux/fsfwconfig/OBSWConfig.h.in
+++ b/linux/fsfwconfig/OBSWConfig.h.in
@ -52,7 +52,7 @@ debugging. */
 #include "OBSWVersion.h"

 /* Can be used to switch device to NORMAL mode immediately */
-#define OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP    0
+#define OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP    1

 #ifdef __cplusplus