Resolve conflicts in #3127#3185

cottsay merged 1 commit into

ros2:mergify/bp/kilted/pr-3081ros2/rclcpp:mergify/bp/kilted/pr-3081from

JEnoch:mergify/bp/kilted/pr-3081-fix-conflictsJEnoch/rclcpp:mergify/bp/kilted/pr-3081-fix-conflictsCopy head branch name to clipboard