From fd7a643cfd60836a4169f4da58bb4a8f1750825d Mon Sep 17 00:00:00 2001
From: Bence Magyar <bence.magyar.robotics@gmail.com>
Date: Tue, 12 Nov 2024 16:00:46 +0000
Subject: [PATCH] fix conflict

---
 pose_broadcaster/package.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pose_broadcaster/package.xml b/pose_broadcaster/package.xml
index f7ff5ac150..94d8c33abe 100644
--- 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="bence.magyar.robotics@gmail.com">Bence Magyar</maintainer>
-  <maintainer email="denis@stogl.de">Denis Stogl</maintainer>
-  <author email="wilbrandt@fzi.de">Robert Wilbrandt</author>
-=======
 
   <maintainer email="bence.magyar.robotics@gmail.com">Bence Magyar</maintainer>
   <maintainer email="denis@stoglrobotics.de">Denis Štogl</maintainer>
   <maintainer email="christoph.froehlich@ait.ac.at">Christoph Froehlich</maintainer>
   <maintainer email="sai.kishor@pal-robotics.com">Sai Kishor Kothakota</maintainer>
->>>>>>> de77fd0 (Update maintainers and add url tags (#1363))
 
   <license>Apache License 2.0</license>