Fix conflicts.

Signed-off-by: Miguel Company <[email protected]>
eProsima · Sep 12, 2024 · c39d608 · c39d608
1 parent 5f18186
commit c39d608
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
@@ -272,20 +272,8 @@ void DomainParticipantImpl::disable()
 
 ReturnCode_t DomainParticipantImpl::delete_contained_entities()
 {
-<<<<<<< HEAD
-    ReturnCode_t ret = efd::DomainParticipantImpl::delete_contained_entities();
-
-    if (ret == ReturnCode_t::RETCODE_OK)
-    {
-        builtin_publisher_impl_ = nullptr;
-        builtin_publisher_ = nullptr;
-    }
-
-    return ret;
-=======
     delete_statistics_builtin_entities();
     return efd::DomainParticipantImpl::delete_contained_entities();
->>>>>>> 0d62335cc (Properly delete builtin statistics writers upon `delete_contained_entities()`  (#4891))
 }
 
 efd::PublisherImpl* DomainParticipantImpl::create_publisher_impl(