Fixed conflicts

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
eProsima · Oct 28, 2022 · d3829a7 · d3829a7
1 parent 8813cdd
commit d3829a7
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/test/blackbox/common/RTPSBlackboxTestsBasic.cpp b/test/blackbox/common/RTPSBlackboxTestsBasic.cpp
@@ -28,15 +28,6 @@
 #include "RTPSAsSocketWriter.hpp"
 #include "RTPSWithRegistrationReader.hpp"
 #include "RTPSWithRegistrationWriter.hpp"
-<<<<<<< HEAD
-#include <fastrtps/xmlparser/XMLProfileManager.h>
-#include <fastrtps/transport/test_UDPv4Transport.h>
-
-#include <gtest/gtest.h>
-
-#include <thread>
-=======
->>>>>>> 90777eccd (Fix dataraces when creating DataWriters (#3015))
 
 using namespace eprosima::fastrtps;
 using namespace eprosima::fastrtps::rtps;