Fix conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

test/unittest/xmlparser/XMLProfileParserTests.cpp

@@ -130,11 +130,7 @@ class XMLProfileParserTests : public XMLProfileParserBasicTests, public testing:
 
     std::string xml_filename_ = "test_xml_profile.xml";
 
-<<<<<<< HEAD
-    const std::pair<std::string, std::string> c_environment_values_[161]
-=======
     const std::pair<std::string, std::string> c_environment_values_[167]
->>>>>>> e6044e011 (Add XML configuration for FlowControllerDescriptor to 2.x (#4893))
     {
         {"XML_PROFILES_ENV_VAR_1",   "123"},
         {"XML_PROFILES_ENV_VAR_2",   "4"},
@@ -296,17 +292,13 @@ class XMLProfileParserTests : public XMLProfileParserBasicTests, public testing:
         {"XML_PROFILES_ENV_VAR_158", "-1"},
         {"XML_PROFILES_ENV_VAR_159", "0"},
         {"XML_PROFILES_ENV_VAR_160", "0"},
-<<<<<<< HEAD
-        {"XML_PROFILES_ENV_VAR_161", "-1"}
-=======
         {"XML_PROFILES_ENV_VAR_161", "-1"},
         {"XML_PROFILES_ENV_VAR_162", "ON"},
         {"XML_PROFILES_ENV_VAR_163", "test_flow_controller"},
         {"XML_PROFILES_ENV_VAR_164", "HIGH_PRIORITY"},
         {"XML_PROFILES_ENV_VAR_165", "2048"},
         {"XML_PROFILES_ENV_VAR_166",  "45"},
         {"XML_PROFILES_ENV_VAR_167",  "test_flow_controller"}
->>>>>>> e6044e011 (Add XML configuration for FlowControllerDescriptor to 2.x (#4893))
     };
 
 };

versions.md

@@ -1,20 +1,6 @@
 Forthcoming
 -----------
 
-<<<<<<< HEAD
-=======
-* Added new `flow_controller_descriptor_list` XML configuration.
-
-Version 2.14.0
---------------
-
-* Added authentication handshake properties.
-* Added methods OpenOutputChannels and CloseOutputChannels to TransportInterface with LocatorSelectorEntry argument.
-* Added `netmask_filter`, `allowlist` and `blocklist` transport configuration options.
-* Added extra configuration options for the builitin transports.
-* Limit the amount of listening ports for TCP servers to 1.
-
->>>>>>> e6044e011 (Add XML configuration for FlowControllerDescriptor to 2.x (#4893))
 Version 2.13.0
 --------------
 
@@ -28,6 +14,7 @@ Version 2.13.0
 * Added configuration of builtin transports through DomainParticipantQos, environment variable and XML.
 * Enable support for DataRepresentationQos to select the CDR encoding.
 * Added authentication handshake properties.
+* Added new `flow_controller_descriptor_list` XML configuration.
 
 Version 2.12.0
 --------------