fixed merge conflicts

bsp_q7s/InitMission.cpp

@@ -43,7 +43,7 @@ void InitMission::initTasks(){
 	/* TMTC Distribution */
 	PeriodicTaskIF* TmTcDistributor = TaskFactory::instance()->
 			createPeriodicTask("DIST", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE,
-					0.100, nullptr);
+					0.2, nullptr);
 	ReturnValue_t result = TmTcDistributor->addComponent(
 			objects::CCSDS_PACKET_DISTRIBUTOR);
 	if(result!=HasReturnvaluesIF::RETURN_OK){