include/app_bridge.h

@@ -9,6 +9,9 @@
 #define MODULES_NBUS_INC_APP_BRIDGE_H_
 
 #include "mcu_platform.h"
+<<<<<<< HEAD
+#include "nbus_config.h"
+=======
 
 typedef enum
 {
@@ -43,6 +46,7 @@ typedef enum
     PARAM_MODE,
     _NBUS_PARAM_COUNT // number of parameters, must be last!
 } nBus_param_t;
+>>>>>>> ebbae90508199fc827eb820f7a19826cea9035ef
 
 typedef enum
 {