Update robot_state_test.cpp

moveit · Nov 16, 2024 · dd5380f · dd5380f
1 parent 727621a
commit dd5380f
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/moveit_core/robot_state/test/robot_state_test.cpp b/moveit_core/robot_state/test/robot_state_test.cpp
@@ -691,10 +691,7 @@ TEST_F(OneRobot, rigidlyConnectedParent)
   EXPECT_EQ(robot_model_->getRigidlyConnectedParentLinkModel(link_b), link_a);
 
   moveit::core::RobotState state(robot_model_);
-<<<<<<< HEAD
-=======
   state.setToDefaultValues();
->>>>>>> f20265a5a (Fixes flaky RobotState test (#3105))
   state.updateLinkTransforms();
 
   EXPECT_EQ(state.getRigidlyConnectedParentLinkModel("link_b"), link_a);