Fix conflicts based on original PR

Signed-off-by: JesusPoderoso <[email protected]>
eProsima · May 20, 2024 · 212dc7d · 212dc7d
1 parent 8b7a86e
commit 212dc7d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 23 deletions.
diff --git a/include/fastdds/rtps/reader/RTPSReader.h b/include/fastdds/rtps/reader/RTPSReader.h
@@ -28,22 +28,10 @@
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-<<<<<<< HEAD
-#include <fastrtps/qos/LivelinessChangedStatus.h>
-#include <fastrtps/utils/TimedConditionVariable.hpp>
-
-#include <fastdds/statistics/rtps/StatisticsCommon.hpp>
-
-#ifdef FASTDDS_STATISTICS
-#include <fastdds/statistics/rtps/monitor_service/interfaces/IConnectionsQueryable.hpp>
-#include <fastdds/statistics/rtps/monitor_service/interfaces/IConnectionsObserver.hpp>
-#endif // ifdef FASTDDS_STATISTICS
-=======
 #include <fastdds/statistics/rtps/monitor_service/connections_fwd.hpp>
 #include <fastdds/statistics/rtps/StatisticsCommon.hpp>
 #include <fastrtps/qos/LivelinessChangedStatus.h>
 #include <fastrtps/utils/TimedConditionVariable.hpp>
->>>>>>> fb841b9a1 (Refactor IStatusQueryable and make monitor service interfaces private (#4651))
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/include/fastdds/rtps/writer/RTPSWriter.h b/include/fastdds/rtps/writer/RTPSWriter.h
@@ -32,24 +32,13 @@
 #include <fastdds/rtps/Endpoint.h>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
 #include <fastdds/rtps/messages/RTPSMessageGroup.h>
-<<<<<<< HEAD
-=======
 #include <fastdds/statistics/rtps/monitor_service/connections_fwd.hpp>
 #include <fastdds/statistics/rtps/StatisticsCommon.hpp>
 #include <fastrtps/qos/LivelinessLostStatus.h>
 
 
->>>>>>> fb841b9a1 (Refactor IStatusQueryable and make monitor service interfaces private (#4651))
 #include "DeliveryRetCode.hpp"
 #include "LocatorSelectorSender.hpp"
-#include <fastrtps/qos/LivelinessLostStatus.h>
-
-#include <fastdds/statistics/rtps/StatisticsCommon.hpp>
-
-#ifdef FASTDDS_STATISTICS
-#include <fastdds/statistics/rtps/monitor_service/interfaces/IConnectionsQueryable.hpp>
-#include <fastdds/statistics/rtps/monitor_service/interfaces/IConnectionsObserver.hpp>
-#endif // ifdef FASTDDS_STATISTICS
 
 namespace eprosima {