summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp b/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
index d464ec826f..1231698eea 100644
--- a/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
@@ -151,7 +151,6 @@ void AsynchConnector::failure(int errCode, std::string message)
}
/*
->>>>>>> .r654667
* Asynch reader/writer
*/
AsynchIO::AsynchIO(const Socket& s,