From c02ade7f59f0afbe8779c324ff20488cc04e919b Mon Sep 17 00:00:00 2001
From: Mario Dominguez <mariodominguez@eprosima.com>
Date: Fri, 13 Dec 2024 09:28:02 +0100
Subject: [PATCH] Fix conflicts

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
---
 .github/workflows/reusable-windows-ci.yml |  7 +------
 versions.md                               | 10 ----------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml
index f2a47213a1e..5af2cc2b2b3 100644
--- 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
diff --git a/versions.md b/versions.md
index 4a33ab145a8..bf1bb44d6c5 100644
--- a/versions.md
+++ b/versions.md
@@ -1,17 +1,7 @@
 Forthcoming
 -----------
 
-<<<<<<< HEAD
-=======
-* Added implementation for:
-  * `DataWriter::get_matched_subscription_data()`
-  * `DataWriter::get_matched_subscriptions()`
-  * `DataReader::get_matched_publication_data()`
-  * `DataReader::get_matched_publications()`
-* Added ``Extended Incompatible QoS`` feature for monitor service.
-* Machine UUID added to the Data(p) to check Participants in same host, instead of using GUIDs.
 * Windows ci example testing infrastructure and `hello world` example.
->>>>>>> 9c9078ff8 (Run examples in Windows CI (#5397))
 
 Version v3.1.0
 --------------