Fix conflicts

Signed-off-by: Mario Dominguez <[email protected]>

.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

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
 --------------