fixed merge conflicts

2022-06-06 10:30:17 +02:00
parent 2fa4fd61d0 c7cf8e710d
commit 161dbde0d7
120 changed files with 3886 additions and 1334 deletions
--- a/src/fsfw/devicehandlers/DeviceHandlerBase.h
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.h
@ -1074,7 +1074,8 @@ class DeviceHandlerBase : public DeviceHandlerIF,
  /**
   * Same as triggerEvent, but for forwarding if object is used as proxy.
   */
-  virtual void forwardEvent(Event event, uint32_t parameter1 = 0, uint32_t parameter2 = 0) const override;
+  virtual void forwardEvent(Event event, uint32_t parameter1 = 0,
+                            uint32_t parameter2 = 0) const override;

  /**
   * Checks if current mode is transitional mode.