From 3653a1676d039f76d44e0acd89bca8ffb1bc1a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?=
 <christophfroehlich@users.noreply.github.com>
Date: Wed, 18 Dec 2024 13:24:27 +0100
Subject: [PATCH] Update package.xml

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

diff --git a/position_controllers/package.xml b/position_controllers/package.xml
index 3dc964d01f..e19e1c950b 100644
--- 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="bence.magyar.robotics@gmail.com">Bence Magyar</maintainer>
   <maintainer email="denis@stoglrobotics.de">Denis Štogl</maintainer>