solved merge conflicts

bsp_q7s/main.cpp

@@ -1,6 +1,7 @@
 #include "InitMission.h"
 #include <OBSWVersion.h>
 #include <fsfw/tasks/TaskFactory.h>
+#include "OBSWConfig.h"
 
 #include <iostream>
 
@@ -13,7 +14,11 @@
 int main(void)
 {
     std::cout << "-- EIVE OBSW --" << std::endl;
+#if TE0720 == 0
     std::cout << "-- Compiled for Linux (Xiphos Q7S) --" << std::endl;
+#else
+    std::cout << "-- Compiled for Linux (TE0720) --" << std::endl;
+#endif
     std::cout << "-- Software version " << SW_NAME << " v" << SW_VERSION << "."
     		<< SW_SUBVERSION << "." << SW_SUBSUBVERSION << " -- " << std::endl;
     std::cout << "-- " <<  __DATE__ << " " << __TIME__ << " --" << std::endl;