From 2226ed4b07bdfe74192dcba7567a9442b7105338 Mon Sep 17 00:00:00 2001
From: Jesus Perez <jesusperez@eprosima.com>
Date: Wed, 28 Feb 2024 15:08:46 +0100
Subject: [PATCH] Refs #20141: Solve conflicts

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
---
 test/unittest/transport/mock/MockTCPv4Transport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/unittest/transport/mock/MockTCPv4Transport.h b/test/unittest/transport/mock/MockTCPv4Transport.h
index ffb7d404897..7a37f2d2f03 100644
--- a/test/unittest/transport/mock/MockTCPv4Transport.h
+++ b/test/unittest/transport/mock/MockTCPv4Transport.h
@@ -64,6 +64,7 @@ class MockTCPv4Transport : public TCPv4Transport
     {
         return TCPv4Transport::send(send_buffer, send_buffer_size, send_resource_locator, remote_locator);
     }
+    
 };
 
 } // namespace rtps