Refs #20262: Resolve conflicts

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
eProsima · Jan 29, 2024 · 8ad3fc7 · 8ad3fc7
1 parent 19634fb
commit 8ad3fc7
Showing 1 changed file with 2 additions and 15 deletions.
diff --git a/src/cpp/rtps/transport/TCPTransportInterface.cpp b/src/cpp/rtps/transport/TCPTransportInterface.cpp
@@ -1292,17 +1292,11 @@ void TCPTransportInterface::SocketAccepted(
             channel->thread(std::thread(&TCPTransportInterface::perform_listen_operation, this,
                     channel_weak_ptr, rtcp_manager_weak_ptr));
 
-<<<<<<< HEAD
-            logInfo(RTCP, " Accepted connection (local: " << IPLocator::to_string(locator)
-                                                          << ", remote: " << channel->remote_endpoint().address()
-                                                          << ":" << channel->remote_endpoint().port() << ")");
-=======
-            EPROSIMA_LOG_INFO(RTCP, "Accepted connection (local: "
+            logInfo(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
         {
@@ -1346,18 +1340,11 @@ void TCPTransportInterface::SecureSocketAccepted(
             secure_channel->thread(std::thread(&TCPTransportInterface::perform_listen_operation, this,
                     channel_weak_ptr, rtcp_manager_weak_ptr));
 
-<<<<<<< HEAD
-            logInfo(RTCP, " Accepted connection (local: " << IPLocator::to_string(locator)
-                                                          << ", remote: " << socket->lowest_layer().remote_endpoint().address()
-                                                          << ":" << socket->lowest_layer().remote_endpoint().port() <<
-                    ")");
-=======
-            EPROSIMA_LOG_INFO(RTCP, " Accepted connection (local: "
+            logInfo(RTCP, " Accepted connection (local: "
                     << socket->lowest_layer().local_endpoint().address() << ":"
                     << socket->lowest_layer().local_endpoint().port() << "), remote: "
                     << socket->lowest_layer().remote_endpoint().address() << ":"
                     << socket->lowest_layer().remote_endpoint().port() << ")");
->>>>>>> 36f7f57b0 (Fix wrong log info messages on TCP (#4258))
         }
         else
         {