From 8f5455717ed84b3a2044ab864aa357ce1f6e7af0 Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Fri, 4 May 2018 13:48:47 -0500 Subject: [PATCH] fix cherry pick leftover --- Net/include/Poco/Net/SocketConnector.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/Net/include/Poco/Net/SocketConnector.h b/Net/include/Poco/Net/SocketConnector.h index d40403251..72be21136 100644 --- a/Net/include/Poco/Net/SocketConnector.h +++ b/Net/include/Poco/Net/SocketConnector.h @@ -20,11 +20,8 @@ #include "Poco/Net/Net.h" #include "Poco/Net/SocketNotification.h" -<<<<<<< HEAD -======= #include "Poco/Net/SocketReactor.h" #include "Poco/Net/ParallelSocketAcceptor.h" ->>>>>>> 0d7f39f... add PollSet::has/empty(); ParallelAcceptor: always use same reactor for a socket, if registered #include "Poco/Net/SocketAddress.h" #include "Poco/Net/StreamSocket.h" #include "Poco/Observer.h"