fixed merge conflicts

2023-02-15 10:29:34 +01:00
parent 305f8aa561 177b573cd4
commit e7123a4bb1
193 changed files with 8179 additions and 3607 deletions
--- a/mission/system/tree/comModeTree.h
+++ b/mission/system/tree/comModeTree.h
@ -13,7 +13,7 @@ extern ComSubsystem SUBSYSTEM;
 // transceiver might be damaged due to overheating
 static const uint32_t TRANSMITTER_TIMEOUT = 900000;  // 15 minutes

-void init();
+Subsystem& init();
 }  // namespace com

 }  // namespace satsystem