From f342d12213008f2f415b7c69ab72b46d538e0428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= <christophfroehlich@users.noreply.github.com> Date: Thu, 21 Mar 2024 09:33:05 +0100 Subject: [PATCH 1/2] Add dep (#256) (cherry picked from commit b35100db16e80ffb574c0266321800e2197136c3) # Conflicts: # ign_ros2_control_demos/package.xml --- ign_ros2_control_demos/package.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ign_ros2_control_demos/package.xml b/ign_ros2_control_demos/package.xml index c329f2c1..a7ebcf6b 100644 --- a/ign_ros2_control_demos/package.xml +++ b/ign_ros2_control_demos/package.xml @@ -28,7 +28,12 @@ <exec_depend>effort_controllers</exec_depend> <exec_depend>geometry_msgs</exec_depend> <exec_depend>hardware_interface</exec_depend> +<<<<<<< HEAD:ign_ros2_control_demos/package.xml <exec_depend>ign_ros2_control</exec_depend> +======= + <exec_depend>gz_ros2_control</exec_depend> + <exec_depend>ros_gz_bridge</exec_depend> +>>>>>>> b35100d (Add dep (#256)):gz_ros2_control_demos/package.xml <exec_depend>imu_sensor_broadcaster</exec_depend> <exec_depend>joint_state_broadcaster</exec_depend> <exec_depend>joint_trajectory_controller</exec_depend> From 02511e098108584f36e8eec8bb4c62774b07a061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= <ahcorde@gmail.com> Date: Thu, 21 Mar 2024 09:37:03 +0100 Subject: [PATCH 2/2] fixed merge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com> --- ign_ros2_control_demos/package.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ign_ros2_control_demos/package.xml b/ign_ros2_control_demos/package.xml index a7ebcf6b..d05a7b64 100644 --- a/ign_ros2_control_demos/package.xml +++ b/ign_ros2_control_demos/package.xml @@ -28,12 +28,7 @@ <exec_depend>effort_controllers</exec_depend> <exec_depend>geometry_msgs</exec_depend> <exec_depend>hardware_interface</exec_depend> -<<<<<<< HEAD:ign_ros2_control_demos/package.xml <exec_depend>ign_ros2_control</exec_depend> -======= - <exec_depend>gz_ros2_control</exec_depend> - <exec_depend>ros_gz_bridge</exec_depend> ->>>>>>> b35100d (Add dep (#256)):gz_ros2_control_demos/package.xml <exec_depend>imu_sensor_broadcaster</exec_depend> <exec_depend>joint_state_broadcaster</exec_depend> <exec_depend>joint_trajectory_controller</exec_depend> @@ -43,6 +38,7 @@ <exec_depend>rclcpp</exec_depend> <exec_depend>robot_state_publisher</exec_depend> <exec_depend>ros_ign_gazebo</exec_depend> + <exec_depend>ros_gz_bridge</exec_depend> <exec_depend>ros2controlcli</exec_depend> <exec_depend>std_msgs</exec_depend> <exec_depend>velocity_controllers</exec_depend>