From 9e8cf7e9bf5ab051333ce13c71ca553f5a476ec4 Mon Sep 17 00:00:00 2001
From: JesusPoderoso <jesuspoderoso@eprosima.com>
Date: Mon, 23 Sep 2024 11:02:16 +0200
Subject: [PATCH] Refs #21638: Fix conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
---
 .../core/policy/ParameterSerializer.hpp       | 55 -------------------
 1 file changed, 55 deletions(-)

diff --git a/src/cpp/fastdds/core/policy/ParameterSerializer.hpp b/src/cpp/fastdds/core/policy/ParameterSerializer.hpp
index 0469cd4fc9..0eb4c094e9 100644
--- a/src/cpp/fastdds/core/policy/ParameterSerializer.hpp
+++ b/src/cpp/fastdds/core/policy/ParameterSerializer.hpp
@@ -434,61 +434,6 @@ inline bool ParameterSerializer<ParameterVendorId_t>::read_content_from_cdr_mess
 }
 
 template<>
-<<<<<<< HEAD
-=======
-inline bool ParameterSerializer<ParameterProductVersion_t>::add_content_to_cdr_message(
-        const ParameterProductVersion_t& parameter,
-        rtps::CDRMessage_t* cdr_message)
-{
-    bool valid = rtps::CDRMessage::addOctet(cdr_message, parameter.version.major);
-    valid &= rtps::CDRMessage::addOctet(cdr_message, parameter.version.minor);
-    valid &= rtps::CDRMessage::addOctet(cdr_message, parameter.version.patch);
-    valid &= rtps::CDRMessage::addOctet(cdr_message, parameter.version.tweak);
-    return valid;
-}
-
-template<>
-inline bool ParameterSerializer<ParameterProductVersion_t>::read_content_from_cdr_message(
-        ParameterProductVersion_t& parameter,
-        rtps::CDRMessage_t* cdr_message,
-        const uint16_t parameter_length)
-{
-    if (parameter_length < PARAMETER_PRODUCT_VERSION_LENGTH)
-    {
-        return false;
-    }
-    parameter.length = parameter_length;
-    bool valid = rtps::CDRMessage::readOctet(cdr_message, &parameter.version.major);
-    valid &= rtps::CDRMessage::readOctet(cdr_message, &parameter.version.minor);
-    valid &= rtps::CDRMessage::readOctet(cdr_message, &parameter.version.patch);
-    valid &= rtps::CDRMessage::readOctet(cdr_message, &parameter.version.tweak);
-    return valid;
-}
-
-template<>
-inline bool ParameterSerializer<ParameterDomainId_t>::add_content_to_cdr_message(
-        const ParameterDomainId_t& parameter,
-        fastdds::rtps::CDRMessage_t* cdr_message)
-{
-    return fastdds::rtps::CDRMessage::addUInt32(cdr_message, parameter.domain_id);
-}
-
-template<>
-inline bool ParameterSerializer<ParameterDomainId_t>::read_content_from_cdr_message(
-        ParameterDomainId_t& parameter,
-        fastdds::rtps::CDRMessage_t* cdr_message,
-        const uint16_t parameter_length)
-{
-    if (parameter_length < PARAMETER_DOMAINID_LENGTH)
-    {
-        return false;
-    }
-    parameter.length = parameter_length;
-    return fastdds::rtps::CDRMessage::readUInt32(cdr_message, &parameter.domain_id);
-}
-
-template<>
->>>>>>> 7b111f911 (Be less strict with parameter lengths (#5225))
 inline bool ParameterSerializer<ParameterIP4Address_t>::add_content_to_cdr_message(
         const ParameterIP4Address_t& parameter,
         fastrtps::rtps::CDRMessage_t* cdr_message)