Solve conflicts

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
eProsima · Nov 15, 2024 · 846ad54 · 846ad54
1 parent 633931b
commit 846ad54
Showing 1 changed file with 1 addition and 6 deletions.
diff --git 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 {