From 9bbfb48e11fc721428d932773686769fe4942c09 Mon Sep 17 00:00:00 2001
From: Miguel Company <miguelcompany@eprosima.com>
Date: Fri, 27 Sep 2024 10:27:33 +0200
Subject: [PATCH] Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
---
 test/blackbox/common/BlackboxTestsTransportUDP.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/blackbox/common/BlackboxTestsTransportUDP.cpp b/test/blackbox/common/BlackboxTestsTransportUDP.cpp
index 04871efac8..173a456c24 100644
--- a/test/blackbox/common/BlackboxTestsTransportUDP.cpp
+++ b/test/blackbox/common/BlackboxTestsTransportUDP.cpp
@@ -15,11 +15,8 @@
 #include <cstdint>
 #include <fstream>
 #include <mutex>
-<<<<<<< HEAD
 #include <set>
-=======
 #include <thread>
->>>>>>> 175add5c2 (Discard changes with big key-only payload and no key hash (#5262))
 #include <vector>
 
 #include <gtest/gtest.h>