fixing merge

source/RobotAPI/libraries/armem_laser_scans/aron_conversions.cpp

@@ -69,7 +69,7 @@ namespace armarx::armem::laser_scans
 
         aronSensorHeader.agent = sensorHeader.agent;
         aronSensorHeader.frame = sensorHeader.frame;
-        toAron(aronSensorHeader.timestamp, sensorHeader.timestamp);
+        aron::toAron(aronSensorHeader.timestamp, sensorHeader.timestamp);
 
         return aronSensorHeader;
     }

source/RobotAPI/libraries/armem_vision/aron_conversions.cpp

@@ -31,40 +31,7 @@ namespace armarx::armem::vision
     {
         return timestamp.toMicroSecondsSinceEpoch();
     }
-
-    arondto::SensorHeader
-    toAron(const SensorHeader& sensorHeader)
-    {
-        arondto::SensorHeader aronSensorHeader;
-
-        aron::toAron(aronSensorHeader.agent, sensorHeader.agent);
-        aron::toAron(aronSensorHeader.frame, sensorHeader.frame);
-        aron::toAron(aronSensorHeader.timestamp, sensorHeader.timestamp);
-
-        return aronSensorHeader;
-    }
-
-    void
-    toAron(const LaserScanStamped& laserScanStamped,
-           arondto::LaserScanStamped& aronLaserScanStamped)
-    {
-        aronLaserScanStamped.header = toAron(laserScanStamped.header);
-        // toAron(laserScanStamped.data, aronLaserScanStamped.data);
-    }
-
-    void
-    toAron(const LaserScan& laserScan,
-           const armem::Time& timestamp,
-           const std::string& frame,
-           const std::string& agentName,
-           arondto::LaserScanStamped& aronLaserScanStamped)
-    {
-        const SensorHeader header{.agent = agentName, .frame = frame, .timestamp = timestamp};
-
-        const LaserScanStamped laserScanStamped{.header = header, .data = laserScan};
-
-        toAron(laserScanStamped, aronLaserScanStamped);
-    }
+    
 
     void
     toAron(arondto::OccupancyGrid& dto, const OccupancyGrid& bo)