Refs #20141: Solve conflicts

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
eProsima · Apr 10, 2024 · 2226ed4 · 2226ed4
1 parent 619cf32
commit 2226ed4
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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