fix merge conflict

ros2 · Feb 5, 2019 · d745ad9 · d745ad9
1 parent ebaa959
commit d745ad9
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/rcl_action/test/rcl_action/test_action_communication.cpp b/rcl_action/test/rcl_action/test_action_communication.cpp
@@ -1031,12 +1031,8 @@ TEST_F(CLASSNAME(TestActionCommunication, RMW_IMPLEMENTATION), test_invalid_feed
   EXPECT_EQ(ret, RCL_RET_INVALID_ARGUMENT) << rcl_get_error_string().str;
   rcl_reset_error();
 
-<<<<<<< HEAD
   test_msgs__action__Fibonacci_Action_Feedback__fini(&incoming_feedback);
   test_msgs__action__Fibonacci_Action_Feedback__fini(&outgoing_feedback);
-=======
-  test_msgs__action__Fibonacci_Action_Feedback__fini(&feedback);
->>>>>>> update test to IDL-based action generation
 }
 
 TEST_F(CLASSNAME(TestActionCommunication, RMW_IMPLEMENTATION), test_invalid_status_opts)