From 4f5b6f9222a3f3346650178c5d86d1b87578fc8b Mon Sep 17 00:00:00 2001 From: "Jakub \"Deli\" Delicat" Date: Wed, 18 Dec 2024 12:54:24 +0100 Subject: [PATCH 1/2] Update position controller package.xml (#1431) (cherry picked from commit a09e7af552c873ce29940b10167af99568252fb2) # Conflicts: # position_controllers/package.xml --- position_controllers/package.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/position_controllers/package.xml b/position_controllers/package.xml index 43715c4ebe..3dc964d01f 100644 --- a/position_controllers/package.xml +++ b/position_controllers/package.xml @@ -1,8 +1,13 @@ position_controllers +<<<<<<< HEAD 2.39.0 Generic controller for forwarding commands. +======= + 4.17.0 + Generic position controller for forwarding position commands. +>>>>>>> a09e7af (Update position controller package.xml (#1431)) Bence Magyar Denis Štogl From 3653a1676d039f76d44e0acd89bca8ffb1bc1a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Wed, 18 Dec 2024 13:24:27 +0100 Subject: [PATCH 2/2] 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 @@ position_controllers -<<<<<<< HEAD 2.39.0 - Generic controller for forwarding commands. -======= - 4.17.0 Generic position controller for forwarding position commands. ->>>>>>> a09e7af (Update position controller package.xml (#1431)) Bence Magyar Denis Štogl