Update package.xml

ros-controls · Dec 18, 2024 · 3653a16 · 3653a16
1 parent 4f5b6f9
commit 3653a16
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/position_controllers/package.xml b/position_controllers/package.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>position_controllers</name>
-<<<<<<< HEAD
   <version>2.39.0</version>
-  <description>Generic controller for forwarding commands.</description>
-=======
-  <version>4.17.0</version>
   <description>Generic position controller for forwarding position commands.</description>
->>>>>>> a09e7af (Update position controller package.xml (#1431))
 
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Denis Štogl</maintainer>