# Conflicts:
#	source/RobotAPI/libraries/ArmarXObjects/test/ArmarXObjectsTest.cpp

# Conflicts:
#	source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp

Signed-off-by: Rainer Kartmann <rainer.kartmann@kit.edu>

# Conflicts:
#	source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp

Tested: from orientation -1.3 to 1.5

on the robot

Adapted paramters for obstacle manager