Add dep (#256)

(cherry picked from commit b35100d) # Conflicts: # ign_ros2_control_demos/package.xml
ros-controls · Mar 21, 2024 · f342d12 · f342d12
1 parent 689c436
commit f342d12
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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>