From 6763977df566b5f878e2c3e15b7adb94dca92e4f Mon Sep 17 00:00:00 2001
From: Mirko Waechter <waechter@kit.edu>
Date: Thu, 13 Mar 2014 18:17:12 +0100
Subject: [PATCH] merge fix
---
source/RobotAPI/CMakeLists.txt | 1 -
source/RobotAPI/units/TCPControlUnit.cpp | 1 -
2 files changed, 2 deletions(-)
diff --git a/source/RobotAPI/CMakeLists.txt b/source/RobotAPI/CMakeLists.txt
index 6d1f81d3a..59796017c 100644
--- a/source/RobotAPI/CMakeLists.txt
+++ b/source/RobotAPI/CMakeLists.txt
@@ -3,6 +3,5 @@ add_subdirectory(motioncontrol)
add_subdirectory(applications)
add_subdirectory(units)
#add_subdirectory(armarx-objects)
-add_subdirectory(OpenHand)
add_subdirectory(statecharts)
diff --git a/source/RobotAPI/units/TCPControlUnit.cpp b/source/RobotAPI/units/TCPControlUnit.cpp
index 1a4cbcd61..382f3af2d 100644
--- a/source/RobotAPI/units/TCPControlUnit.cpp
+++ b/source/RobotAPI/units/TCPControlUnit.cpp
@@ -726,7 +726,6 @@ namespace armarx
{
bestJVError = jointDeltaIterations.at(i).first;
resultJointDelta = jointDeltaIterations.at(i).second;
- bestIndex = i;
}
--
GitLab