From 126d62fb8a1ec69b8fcd65150a75fe544145367e Mon Sep 17 00:00:00 2001 From: Paul Gesel Date: Wed, 24 Apr 2024 02:14:30 -0400 Subject: [PATCH 1/2] add generate_parameter_library 0.37 until latest release is fixed (#2802) Signed-off-by: Paul Gesel (cherry picked from commit 1f853c36f2c0ff75d102f63a94f59346eb33d9f8) # Conflicts: # moveit2.repos --- moveit2.repos | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/moveit2.repos b/moveit2.repos index 6c9f2668e4..cc22f6a976 100644 --- a/moveit2.repos +++ b/moveit2.repos @@ -8,4 +8,12 @@ repositories: moveit_resources: type: git url: https://github.com/ros-planning/moveit_resources.git +<<<<<<< HEAD version: humble +======= + version: ros2 + generate_parameter_library: + type: git + url: https://github.com/PickNikRobotics/generate_parameter_library.git + version: 0.3.7 +>>>>>>> 1f853c36f (add generate_parameter_library 0.37 until latest release is fixed (#2802)) From 938dd0b93de4aee70da71a06ff7be84f69afe341 Mon Sep 17 00:00:00 2001 From: Stephanie Eng Date: Wed, 24 Apr 2024 16:36:57 -0400 Subject: [PATCH 2/2] Fix merge conflict --- moveit2.repos | 4 ---- 1 file changed, 4 deletions(-) diff --git a/moveit2.repos b/moveit2.repos index cc22f6a976..4151770ab3 100644 --- a/moveit2.repos +++ b/moveit2.repos @@ -8,12 +8,8 @@ repositories: moveit_resources: type: git url: https://github.com/ros-planning/moveit_resources.git -<<<<<<< HEAD version: humble -======= - version: ros2 generate_parameter_library: type: git url: https://github.com/PickNikRobotics/generate_parameter_library.git version: 0.3.7 ->>>>>>> 1f853c36f (add generate_parameter_library 0.37 until latest release is fixed (#2802))