Fixed merge

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
ros-controls · Jan 4, 2024 · 54cdb2e · 54cdb2e
1 parent a8d16e2
commit 54cdb2e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 23 deletions.
diff --git a/gz_ros2_control_tests/urdf/test_cart_position.xacro.urdf b/gz_ros2_control_tests/urdf/test_cart_position.xacro.urdf
@@ -90,13 +90,8 @@
 
   <gazebo>
     <!-- Joint state publisher -->
-<<<<<<< HEAD
     <plugin filename="ign_ros2_control-system" name="ign_ros2_control::IgnitionROS2ControlPlugin">
-      <parameters>$(find gz_ros2_control_tests)/config/cartpole_controller_position.yaml</parameters>
-=======
-    <plugin filename="gz_ros2_control-system" name="gz_ros2_control::GazeboSimROS2ControlPlugin">
       <parameters>$(find gz_ros2_control_tests)/config/cart_controller_position.yaml</parameters>
->>>>>>> 7e388fa (Rename cartpole with cart (#214))
     </plugin>
   </gazebo>
 </robot>
diff --git a/ign_ros2_control_demos/urdf/test_cart_effort.xacro.urdf b/ign_ros2_control_demos/urdf/test_cart_effort.xacro.urdf
@@ -78,13 +78,8 @@
 
   <gazebo>
     <!-- Joint state publisher -->
-<<<<<<< HEAD:ign_ros2_control_demos/urdf/test_cart_effort.xacro.urdf
     <plugin filename="ign_ros2_control-system" name="ign_ros2_control::IgnitionROS2ControlPlugin">
-      <parameters>$(find ign_ros2_control_demos)/config/cartpole_controller_effort.yaml</parameters>
-=======
-    <plugin filename="gz_ros2_control-system" name="gz_ros2_control::GazeboSimROS2ControlPlugin">
-      <parameters>$(find gz_ros2_control_demos)/config/cart_controller_effort.yaml</parameters>
->>>>>>> 7e388fa (Rename cartpole with cart (#214)):gz_ros2_control_demos/urdf/test_cart_effort.xacro.urdf
+      <parameters>$(find ign_ros2_control_demos)/config/cart_controller_effort.yaml</parameters>
     </plugin>
   </gazebo>
 </robot>
diff --git a/ign_ros2_control_demos/urdf/test_cart_position.xacro.urdf b/ign_ros2_control_demos/urdf/test_cart_position.xacro.urdf
@@ -78,13 +78,8 @@
 
   <gazebo>
     <!-- Joint state publisher -->
-<<<<<<< HEAD:ign_ros2_control_demos/urdf/test_cart_position.xacro.urdf
     <plugin filename="ign_ros2_control-system" name="ign_ros2_control::IgnitionROS2ControlPlugin">
-      <parameters>$(find ign_ros2_control_demos)/config/cartpole_controller_position.yaml</parameters>
-=======
-    <plugin filename="gz_ros2_control-system" name="gz_ros2_control::GazeboSimROS2ControlPlugin">
-      <parameters>$(find gz_ros2_control_demos)/config/cart_controller_position.yaml</parameters>
->>>>>>> 7e388fa (Rename cartpole with cart (#214)):gz_ros2_control_demos/urdf/test_cart_position.xacro.urdf
+      <parameters>$(find ign_ros2_control_demos)/config/cart_controller_position.yaml</parameters>
     </plugin>
   </gazebo>
 </robot>
diff --git a/ign_ros2_control_demos/urdf/test_cart_velocity.xacro.urdf b/ign_ros2_control_demos/urdf/test_cart_velocity.xacro.urdf
@@ -156,13 +156,8 @@
 
   <gazebo>
     <!-- Joint state publisher -->
-<<<<<<< HEAD:ign_ros2_control_demos/urdf/test_cart_velocity.xacro.urdf
     <plugin filename="ign_ros2_control-system" name="ign_ros2_control::IgnitionROS2ControlPlugin">
-      <parameters>$(find ign_ros2_control_demos)/config/cartpole_controller_velocity.yaml</parameters>
-=======
-    <plugin filename="gz_ros2_control-system" name="gz_ros2_control::GazeboSimROS2ControlPlugin">
-      <parameters>$(find gz_ros2_control_demos)/config/cart_controller_velocity.yaml</parameters>
->>>>>>> 7e388fa (Rename cartpole with cart (#214)):gz_ros2_control_demos/urdf/test_cart_velocity.xacro.urdf
+      <parameters>$(find ign_ros2_control_demos)/config/cart_controller_velocity.yaml</parameters>
     </plugin>
     <plugin
       filename="ignition-gazebo-imu-system"