From 32fd3d0172ed5b3fe8dafe72f0cdce70f4d5ed4c Mon Sep 17 00:00:00 2001
From: Bence Magyar <bence.magyar.robotics@gmail.com>
Date: Tue, 12 Nov 2024 16:01:19 +0000
Subject: [PATCH] Update package.xml

---
 range_sensor_broadcaster/package.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/range_sensor_broadcaster/package.xml b/range_sensor_broadcaster/package.xml
index d842413dc0..dac5c2e039 100644
--- a/range_sensor_broadcaster/package.xml
+++ b/range_sensor_broadcaster/package.xml
@@ -2,14 +2,9 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>range_sensor_broadcaster</name>
-<<<<<<< HEAD
   <version>3.27.0</version>
-  <description>Controller to publish readings of Range sensors.</description>
-=======
-  <version>4.16.0</version>
   <description>Controller to publish readings of range sensors.</description>
 
->>>>>>> de77fd0 (Update maintainers and add url tags (#1363))
   <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>