From 847139333dd9301a7d7909ea365532c8b562447d Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Mon, 25 Mar 2024 10:21:43 +0100 Subject: [PATCH] Fix conflicts Signed-off-by: JesusPoderoso --- .github/workflows/reusable-ubuntu-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml index a3e1b4c1c73..a2341d240af 100644 --- a/.github/workflows/reusable-ubuntu-ci.yml +++ b/.github/workflows/reusable-ubuntu-ci.yml @@ -97,11 +97,7 @@ jobs: colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/ci.meta colcon_build_args: ${{ inputs.colcon-args }} cmake_args: ${{ inputs.cmake-args }} -<<<<<<< HEAD - cmake_args_default: -DCMAKE_CXX_FLAGS="-Werror -Wall" -======= cmake_args_default: -DCMAKE_CXX_FLAGS="-Werror -Wall -Wextra -Wpedantic -Wunused-value -Woverloaded-virtual" -DFASTDDS_EXAMPLE_TESTS=ON ->>>>>>> 63cc242b2 (Fix hidden overloaded virtual methods (#4516)) cmake_build_type: ${{ matrix.cmake-build-type }} workspace: ${{ github.workspace }}