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 @@ effort_controllers geometry_msgs hardware_interface +<<<<<<< HEAD:ign_ros2_control_demos/package.xml ign_ros2_control +======= + gz_ros2_control + ros_gz_bridge +>>>>>>> b35100d (Add dep (#256)):gz_ros2_control_demos/package.xml imu_sensor_broadcaster joint_state_broadcaster joint_trajectory_controller