From e32322d121416eb288a4ab19b577ae072a440878 Mon Sep 17 00:00:00 2001
From: Mario Dominguez <mariodominguez@eprosima.com>
Date: Fri, 15 Nov 2024 08:09:07 +0100
Subject: [PATCH] Solve conflicts

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
---
 src/cpp/rtps/RTPSDomainImpl.hpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/cpp/rtps/RTPSDomainImpl.hpp b/src/cpp/rtps/RTPSDomainImpl.hpp
index 61bee2d1845..c07a3b54d59 100644
--- a/src/cpp/rtps/RTPSDomainImpl.hpp
+++ b/src/cpp/rtps/RTPSDomainImpl.hpp
@@ -29,18 +29,13 @@
 #include <fastrtps/rtps/RTPSDomain.h>
 #include <fastrtps/rtps/writer/RTPSWriter.h>
 
+#include <utils/shared_memory/BoostAtExitRegistry.hpp>
 #include <utils/SystemInfo.hpp>
 
-<<<<<<< HEAD
-#include <utils/shared_memory/BoostAtExitRegistry.hpp>
-=======
 #if HAVE_SECURITY
 #include <security/OpenSSLInit.hpp>
 #endif // HAVE_SECURITY
 
-#include <fastdds/xtypes/type_representation/TypeObjectRegistry.hpp>
->>>>>>> 44310c4f8 ([22024] Improve `OpenSSL` lifecycle handling (#5384))
-
 namespace eprosima {
 namespace fastrtps {
 namespace rtps {