fix conflict

ros-controls · Nov 12, 2024 · fd7a643 · fd7a643
1 parent 18a6ee5
commit fd7a643
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/pose_broadcaster/package.xml b/pose_broadcaster/package.xml
@@ -4,17 +4,11 @@
   <name>pose_broadcaster</name>
   <version>3.27.0</version>
   <description>Broadcaster to publish cartesian states.</description>
-<<<<<<< HEAD
-  <maintainer email="[email protected]">Bence Magyar</maintainer>
-  <maintainer email="[email protected]">Denis Stogl</maintainer>
-  <author email="[email protected]">Robert Wilbrandt</author>
-=======
 
   <maintainer email="[email protected]">Bence Magyar</maintainer>
   <maintainer email="[email protected]">Denis Štogl</maintainer>
   <maintainer email="[email protected]">Christoph Froehlich</maintainer>
   <maintainer email="[email protected]">Sai Kishor Kothakota</maintainer>
->>>>>>> de77fd0 (Update maintainers and add url tags (#1363))
 
   <license>Apache License 2.0</license>