linux compat

1a339b87 · Dipl.-Ing. Jonas Stienen · e3a1d229 · e3a1d229 · 1a339b87
Commit 1a339b87 authored Feb 03, 2017 by Dipl.-Ing. Jonas Stienen
Showing with 1 addition and 5 deletions

tests/NetAudio/ITANetAudioStreamingServerTest tests/NetAudio/ITANetAudioStreamingServerTest +0 -0

tests/NetAudio/ITANetAudioStreamingServerTest.cpp tests/NetAudio/ITANetAudioStreamingServerTest.cpp +1 -5

No files found.
--- a/tests/NetAudio/ITANetAudioStreamingServerTest
+++ b/tests/NetAudio/ITANetAudioStreamingServerTest
--- a/tests/NetAudio/ITANetAudioStreamingServerTest.cpp
+++ b/tests/NetAudio/ITANetAudioStreamingServerTest.cpp
@@ -5,12 +5,8 @@
 #include <ITANetAudioServer.h>
 #include <ITAStreamFunctionGenerator.h>
 #include <ITAStreamMultiplier1N.h>
-<<<<<<< HEAD
 #include <ITAFileDataSource.h>
-=======
-#include <ITAFileDatasource.h>
-#include <VistaBase\VistaTimeUtils.h>
->>>>>>> 8eb8596629ad0642aaaec5a68bf1554216289863
+#include <VistaBase/VistaTimeUtils.h>

 using namespace std;