Skip to content
Snippets Groups Projects

Feature/armem laser scans

Merged Fabian Reister requested to merge feature/armem_laser_scans into master
1 file
+ 0
4
Compare changes
  • Side-by-side
  • Inline
@@ -314,11 +314,7 @@ 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);
Loading