fixed handUnitInterface

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
+
     };
 
 };