Refs #20262: Resolve conflicts

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
eProsima · Feb 1, 2024 · 48ed040 · 48ed040
1 parent 3813aa3
commit 48ed040
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/cpp/rtps/transport/TCPTransportInterface.cpp b/src/cpp/rtps/transport/TCPTransportInterface.cpp
@@ -1317,17 +1317,11 @@ void TCPTransportInterface::SocketAccepted(
             channel->thread(std::thread(&TCPTransportInterface::perform_listen_operation, this,
                     channel_weak_ptr, rtcp_manager_weak_ptr));
 
-<<<<<<< HEAD
-            EPROSIMA_LOG_INFO(RTCP, " Accepted connection (local: " << IPLocator::to_string(locator)
-                                                                    << ", remote: " << channel->remote_endpoint().address()
-                                                                    << ":" << channel->remote_endpoint().port() << ")");
-=======
             EPROSIMA_LOG_INFO(RTCP, "Accepted connection (local: "
                     << channel->local_endpoint().address() << ":"
                     << channel->local_endpoint().port() << "), remote: "
                     << channel->remote_endpoint().address() << ":"
                     << channel->remote_endpoint().port() << ")");
->>>>>>> 36f7f57b0 (Fix wrong log info messages on TCP (#4258))
         }
         else
         {