fixing merge

fbc7c5fb · Fabian Reister · Fabian Reister · dedc3ace · fbc7c5fb
Commit fbc7c5fb authored 2 years ago by Fabian Reister Committed by Fabian Reister 2 years ago
--- a/source/RobotAPI/libraries/armem_laser_scans/server/Visu.cpp
+++ b/source/RobotAPI/libraries/armem_laser_scans/server/Visu.cpp
@@ -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);