Fix merge conflict

ros-controls · Jul 20, 2024 · 1dd8351 · 1dd8351
1 parent ff5574a
commit 1dd8351
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/controller_interface/src/controller_interface_base.cpp b/controller_interface/src/controller_interface_base.cpp
@@ -83,12 +83,7 @@ const rclcpp_lifecycle::State & ControllerInterfaceBase::configure()
   // Other solution is to add check into the LifecycleNode if a transition is valid to trigger
   if (get_state().id() == lifecycle_msgs::msg::State::PRIMARY_STATE_UNCONFIGURED)
   {
-<<<<<<< HEAD
-    update_rate_ = get_node()->get_parameter("update_rate").as_int();
-=======
     update_rate_ = static_cast<unsigned int>(get_node()->get_parameter("update_rate").as_int());
-    is_async_ = get_node()->get_parameter("is_async").as_bool();
->>>>>>> 2569b76 ([ControllerInterface] Avoid warning about conversion from `int64_t` to `unsigned int` (#1173))
   }
 
   return get_node()->configure();