Commit 7b56bae6 authored by jan.koester's avatar jan.koester
Browse files

corrected merge

parent c20b530c
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -65,7 +65,3 @@ void netplus::socket::setnonblocking(){
        throw exception;
    }
}


return _Socket;
}