From 2935c158e7656801a761fe6f8d6a3c4b7585c856 Mon Sep 17 00:00:00 2001 From: Christoph Froehlich Date: Sun, 18 Feb 2024 14:12:23 +0000 Subject: [PATCH] Fix merge conflict --- .github/workflows/ci-ros-lint.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/ci-ros-lint.yml b/.github/workflows/ci-ros-lint.yml index a87e4ca2b..9fb879e35 100644 --- a/.github/workflows/ci-ros-lint.yml +++ b/.github/workflows/ci-ros-lint.yml @@ -52,20 +52,4 @@ jobs: distribution: humble linter: cpplint arguments: "--linelength=100 --filter=-whitespace/newline" -<<<<<<< HEAD - package-name: - ros2_control_demo_example_1 - ros2_control_demo_example_2 - ros2_control_demo_example_3 - ros2_control_demo_example_4 - ros2_control_demo_example_5 - ros2_control_demo_example_6 - ros2_control_demo_example_7 - ros2_control_demo_example_8 - ros2_control_demo_example_9 - ros2_control_demo_example_10 - ros2_control_demo_example_12 - ros2_control_demo_example_14 -======= package-name: ${{ env.package-name }} ->>>>>>> 044db05 ([CI] Use a single list for lint job (#451))