Fix conflicts

Signed-off-by: Mario Dominguez <[email protected]>
eProsima · Dec 13, 2024 · 00ea3db · 00ea3db
1 parent 7f97007
commit 00ea3db
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml
@@ -141,13 +141,8 @@ jobs:
           colcon_build_args: ${{ inputs.colcon-args }}
           # The following Fast DDS CMake options need to be specified here instead of in the meta files
           # because they vary from platform to platform
-<<<<<<< HEAD
-          cmake_args_default: ${{ inputs.cmake-args }} -T ${{ matrix.vs-toolset }} -DTHIRDPARTY_Asio=FORCE -DTHIRDPARTY_TinyXML2=FORCE -DTHIRDPARTY_fastcdr=OFF -DTHIRDPARTY_UPDATE=ON -DEPROSIMA_EXTRA_CMAKE_CXX_FLAGS="/MP /WX"
-          cmake_build_type: ${{ matrix.cmake-config }}
-=======
           cmake_args_default: ${{ inputs.cmake-args }} -T ${{ matrix.vs-toolset }} -DTHIRDPARTY_Asio=FORCE -DTHIRDPARTY_TinyXML2=FORCE -DTHIRDPARTY_fastcdr=OFF -DTHIRDPARTY_UPDATE=ON -DFASTDDS_EXAMPLE_TESTS=ON -DEPROSIMA_EXTRA_CMAKE_CXX_FLAGS="/MP /WX"
-          cmake_build_type: ${{ inputs.cmake-config }}
->>>>>>> 9c9078ff8 (Run examples in Windows CI (#5397))
+          cmake_build_type: ${{ matrix.cmake-config }}
           workspace: ${{ github.workspace }}
 
       - name: Test