Fixing merge stuff

d7d9cda2 · Dipl.-Ing. Jonas Stienen · f8cea23d · d7d9cda2
Commit d7d9cda2 authored Feb 22, 2017 by Dipl.-Ing. Jonas Stienen
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

include/ITANetAudioStreamingClient.h include/ITANetAudioStreamingClient.h +1 -3

No files found.
--- a/include/ITANetAudioStreamingClient.h
+++ b/include/ITANetAudioStreamingClient.h
@@ -67,9 +67,7 @@ private:
 	CITANetAudioStream* m_pStream;

 	CITANetAudioProtocol* m_pProtocol;
-	CITANetAudioMessage* m_pIncomingMessage;
-	CITANetAudioMessage* m_pOutgoingMessage;
-
+	CITANetAudioMessage* m_pMessage;
 	VistaConnectionIP* m_pConnection;

 	VistaThreadEvent m_oBlockIncrementEvent;