From 0b3fea28a8fddb95b3a2469e0c0a4e6146792c7e Mon Sep 17 00:00:00 2001
From: Nikolaus Vahrenkamp <vahrenkamp@kit.edu>
Date: Fri, 15 Aug 2014 08:47:25 +0200
Subject: [PATCH] fixed handUnitInterface
---
source/RobotAPI/interface/units/HandUnitInterface.ice | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/source/RobotAPI/interface/units/HandUnitInterface.ice b/source/RobotAPI/interface/units/HandUnitInterface.ice
index 582ebe79f..b223021af 100644
--- a/source/RobotAPI/interface/units/HandUnitInterface.ice
+++ b/source/RobotAPI/interface/units/HandUnitInterface.ice
@@ -60,19 +60,11 @@ module armarx
interface HandUnitListener extends armarx::ObserverInterface
{
-<<<<<<< HEAD
- void reportHandClosed();
- void reportHandOpened();
- void reportHandPreshaped();
-
- // informs all listeners that we grasped an object
- void reportObjectGrasped(string robotName, string robotNodeName, string objectName);
-=======
void reportHandClosed(bool isLeftHand);
void reportHandOpened(bool isLeftHand);
void reportHandPreshaped(bool isLeftHand);
void reportNewHandShapeName(bool isLeftHand, string handShapeName);
->>>>>>> 2f3326fdfecad75fe7a1047e694a6857ba78b6aa
+
};
};
--
GitLab