1 files changed, 11 insertions, 0 deletions
diff --git a/lib/server/SocketStream.h b/lib/server/SocketStream.h
index 2b582f21..aa62e4e9 100644
--- a/lib/server/SocketStream.h
+++ b/lib/server/SocketStream.h
@@ -51,7 +51,10 @@ public:
 	virtual bool GetPeerCredentials(uid_t &rUidOut, gid_t &rGidOut);
 
 protected:
+<<<<<<< HEAD
 	tOSSocketHandle GetSocketHandle();
+=======
+>>>>>>> 0.12
 	void MarkAsReadClosed() {mReadClosed = true;}
 	void MarkAsWriteClosed() {mWriteClosed = true;}
 
@@ -69,6 +72,14 @@ public:
 	off_t GetBytesWritten() const {return mBytesWritten;}
 	void ResetCounters() {mBytesRead = mBytesWritten = 0;}
 	bool IsOpened() { return mSocketHandle != INVALID_SOCKET_VALUE; }
+<<<<<<< HEAD
+=======
+	
+	/**
+	 * Only for use by NiceSocketStream!
+	 */
+	tOSSocketHandle GetSocketHandle();
+>>>>>>> 0.12
 };
 
 #endif // SOCKETSTREAM__H