Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
christophfroehlich committed Feb 18, 2024
1 parent 60bbd55 commit 2935c15
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions .github/workflows/ci-ros-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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))

0 comments on commit 2935c15

Please sign in to comment.