Fix conflicts

Signed-off-by: JesusPoderoso <[email protected]>
eProsima · Mar 25, 2024 · 8471393 · 8471393
1 parent 1dbe74d
commit 8471393
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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 }}