fix conflict

ros-controls · Nov 12, 2024 · 18a6ee5 · 18a6ee5
1 parent e49ee52
commit 18a6ee5
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/diff_drive_controller/package.xml b/diff_drive_controller/package.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>diff_drive_controller</name>
-<<<<<<< HEAD
   <version>3.27.0</version>
-  <description>Controller for a differential drive mobile base.</description>
-=======
-  <version>4.16.0</version>
   <description>Controller for a differential-drive mobile base.</description>
 
->>>>>>> de77fd0 (Update maintainers and add url tags (#1363))
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Denis Štogl</maintainer>
   <maintainer email="[email protected]">Christoph Froehlich</maintainer>