Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

Author: MiguelCompany

test/blackbox/common/DDSBlackboxTestsContentFilter.cpp

@@ -164,14 +164,8 @@ class DDSContentFilter : public testing::TestWithParam<communication_type>
         switch (GetParam())
         {
             case communication_type::INTRAPROCESS:
-<<<<<<< HEAD
                 library_settings.intraprocess_delivery = IntraprocessDeliveryType::INTRAPROCESS_FULL;
                 xmlparser::XMLProfileManager::library_settings(library_settings);
-=======
-                library_settings.intraprocess_delivery = eprosima::fastdds::IntraprocessDeliveryType::INTRAPROCESS_FULL;
-                eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->set_library_settings(
-                    library_settings);
->>>>>>> 61f867715 (Reset irrelevant sequence numbers interval in proxy readers (#6241))
                 break;
             case communication_type::DATASHARING:
                 enable_datasharing = true;
@@ -193,14 +187,8 @@ class DDSContentFilter : public testing::TestWithParam<communication_type>
         switch (GetParam())
         {
             case communication_type::INTRAPROCESS:
-<<<<<<< HEAD
                 library_settings.intraprocess_delivery = IntraprocessDeliveryType::INTRAPROCESS_OFF;
                 xmlparser::XMLProfileManager::library_settings(library_settings);
-=======
-                library_settings.intraprocess_delivery = eprosima::fastdds::IntraprocessDeliveryType::INTRAPROCESS_OFF;
-                eprosima::fastdds::dds::DomainParticipantFactory::get_instance()->set_library_settings(
-                    library_settings);
->>>>>>> 61f867715 (Reset irrelevant sequence numbers interval in proxy readers (#6241))
                 break;
             case communication_type::DATASHARING:
                 break;