resolved merge conflict - removed rclc_parameters

Signed-off-by: Jan Staschulat <jan.staschulat@de.bosch.com>
ros2 · Jul 28, 2021 · 6e50b86 · 6e50b86
1 parent 7a7e0ff
commit 6e50b86
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/codecov.yml b/codecov.yml
@@ -2,10 +2,5 @@ fixes:
   - "ros_ws/src/*/rclc::"
 ignore:
   - "rclc/test/**/*"
-<<<<<<< HEAD
-  - "rclc_lifecycle/test/**/*"
-=======
   - "rclc_examples/**/*"
   - "rclc_lifecycle/test/*"
-  - "rclc_parameter/test/**/*"
->>>>>>> 359c265 (Fix codecov to ignore unit tests and rclc_examples package (#155))