Merge branch 'feature/armem_laser_scans' of gitlab.com:ArmarX/RobotAPI into...

Merge branch 'feature/armem_laser_scans' of gitlab.com:ArmarX/RobotAPI into feature/armem_laser_scans

source/RobotAPI/libraries/armem_laser_scans/server/Visu.cpp

@@ -314,7 +314,11 @@ namespace armarx::armem::server::laser_scans
 
         if(not virtualRobotReader->synchronizeRobot(*robot, timestamp))
         {
+<<<<<<< HEAD
             ARMARX_VERBOSE << "Faield to synchronize robot `" << name << "`";
+=======
+            ARMARX_INFO << deactivateSpam(10) << "Failed to synchronize robot `" << name << "`";
+>>>>>>> 39bb2bb1bf71c0b5d37478870d1edd4f4ac2c117
         }
 
         return robots.at(name);