fixed merge conflicts

2021-03-26 12:30:24 +01:00
parent 887a47f7f5 fed2d56e20
commit 1492d168d8
59 changed files with 1403 additions and 807 deletions
--- a/fsfwconfig/objects/systemObjectList.h
+++ b/fsfwconfig/objects/systemObjectList.h
@ -43,7 +43,6 @@ namespace objects {
 		ACU_HANDLER = 0x44000004,
 		TMP1075_HANDLER_1 = 0x44000005,
 		TMP1075_HANDLER_2 = 0x44000006,
-
        MGM_0_LIS3_HANDLER = 0x4400007,
 		MGM_1_RM3100_HANDLER = 0x44000008,
 		MGM_2_LIS3_HANDLER = 0x44000009,