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/returnvalues/classIds.h
+++ b/fsfwconfig/returnvalues/classIds.h
@ -19,7 +19,7 @@ enum {
 	HEATER_HANDLER,
 	SA_DEPL_HANDLER,
 	SYRLINKS_HANDLER,
-	IMQT_HANDLER,
+	IMTQ_HANDLER,
 };
 }