Fix backport issues

Signed-off-by: Emilio Cuesta <emiliocuesta@eprosima.com>

Author: emiliocuestaf

src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp

@@ -67,23 +67,6 @@ namespace rtps {
 using reader_map_helper = utilities::collections::map_size_helper<GUID_t, SubscriptionMatchedStatus>;
 using writer_map_helper = utilities::collections::map_size_helper<GUID_t, PublicationMatchedStatus>;
 
-<<<<<<< HEAD
-static bool is_partition_empty(
-        const fastdds::dds::Partition_t& partition)
-{
-    return partition.size() <= 1 && 0 == strlen(partition.name());
-=======
-static bool is_same_type(
-        const dds::xtypes::TypeInformation& t1,
-        const dds::xtypes::TypeInformation& t2)
-{
-    return (dds::xtypes::TK_NONE != t1.complete().typeid_with_size().type_id()._d()
-           && t1.complete().typeid_with_size() == t2.complete().typeid_with_size())
-           || (dds::xtypes::TK_NONE != t1.minimal().typeid_with_size().type_id()._d()
-           && t1.minimal().typeid_with_size() == t2.minimal().typeid_with_size());
->>>>>>> 27ce90d9 (Allow empty partition list to match against `"*"` (#5989))
-}
-
 EDP::EDP(
         PDP* p,
         RTPSParticipantImpl* part)

src/cpp/utils/StringMatching.cpp

@@ -104,9 +104,6 @@ static bool do_match_pattern(
 
 #endif // if defined(__cplusplus_winrt)
 
-<<<<<<< HEAD
-} // namespace rtps
-=======
 bool StringMatching::matchPattern(
         const char* pattern,
         const char* str)
@@ -121,6 +118,6 @@ bool StringMatching::matchString(
     return do_match_pattern(str1, str2) || do_match_pattern(str2, str1);
 }
 
->>>>>>> 27ce90d9 (Allow empty partition list to match against `"*"` (#5989))
 } /* namespace rtps */
+} /* namespace fastrtps */
 } /* namespace eprosima */