From 727a55fac8773269701982e3b48ef115bdf5e9f3 Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Fri, 12 Mar 2021 15:49:48 +0100
Subject: [PATCH] fixing merge

---
 .../RobotAPI/components/RobotState/RobotStateComponent.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/source/RobotAPI/components/RobotState/RobotStateComponent.cpp b/source/RobotAPI/components/RobotState/RobotStateComponent.cpp
index f443dcd41..9f04172c5 100644
--- a/source/RobotAPI/components/RobotState/RobotStateComponent.cpp
+++ b/source/RobotAPI/components/RobotState/RobotStateComponent.cpp
@@ -390,18 +390,11 @@ namespace armarx
         // Unused.
     }
 
-    void RobotStateComponent::setRobotStateObserver(RobotStateObserverPtr observer)
-    {
-        // Unused.
-    }
-
-
     void RobotStateComponent::reportPlatformVelocity(const VelocityStamped&, const Current&)
     {
         // Unused.
     }
 
-
     void RobotStateComponent::reportPlatformOdometryPose(const PoseStamped&, const Current&)
     {
         // Unused.
-- 
GitLab