Fix conflicts

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
eProsima · Dec 1, 2023 · 165c0b1 · 165c0b1
1 parent fbd329c
commit 165c0b1
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 2,259 deletions.
diff --git a/test/blackbox/common/BlackboxTestsPubSubHistory.cpp b/test/blackbox/common/BlackboxTestsPubSubHistory.cpp
@@ -12,30 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-<<<<<<< HEAD
-#include "BlackboxTests.hpp"
-
-#include "PubSubReader.hpp"
-#include "PubSubWriter.hpp"
-=======
 #include <atomic>
 #include <thread>
 #include <tuple>
 
 #include <gtest/gtest.h>
->>>>>>> 6390715a1 (Add missing thread include (#4045))
 
 #include <fastrtps/xmlparser/XMLProfileManager.h>
 
 #include "BlackboxTests.hpp"
 #include "PubSubReader.hpp"
 #include "PubSubWriter.hpp"
 #include <rtps/transport/test_UDPv4Transport.h>
-<<<<<<< HEAD
-#include <gtest/gtest.h>
-#include <tuple>
-=======
->>>>>>> 6390715a1 (Add missing thread include (#4045))
 
 using namespace eprosima::fastrtps;
 using namespace eprosima::fastdds::rtps;

diff --git a/test/blackbox/common/DDSBlackboxTestsListeners.cpp b/test/blackbox/common/DDSBlackboxTestsListeners.cpp
@@ -12,32 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-<<<<<<< HEAD
-=======
 #include <set>
 #include <thread>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 #include <fastdds/dds/core/condition/GuardCondition.hpp>
 #include <fastdds/dds/core/condition/StatusCondition.hpp>
 #include <fastdds/dds/core/condition/WaitSet.hpp>
 #include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
 #include <fastrtps/xmlparser/XMLProfileManager.h>
 
->>>>>>> 6390715a1 (Add missing thread include (#4045))
-#include "BlackboxTests.hpp"
+#include <fastrtps/xmlparser/XMLProfileManager.h>
 
+#include "BlackboxTests.hpp"
 #include "PubSubReader.hpp"
 #include "PubSubWriter.hpp"
-#include <fastrtps/xmlparser/XMLProfileManager.h>
-
-#include <fastdds/dds/core/condition/StatusCondition.hpp>
-#include <fastdds/dds/core/condition/GuardCondition.hpp>
-#include <fastdds/dds/core/condition/WaitSet.hpp>
-
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
-
-#include <gtest/gtest.h>
 
 using namespace eprosima::fastrtps;
 using namespace eprosima::fastrtps::rtps;