Fixing improper merge trial

include/ITAHPT.h

@@ -21,10 +21,6 @@
 
 #include <ITABaseDefinitions.h>
 
-<<<<<<< HEAD
-
-=======
->>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
 #include <string>
 #ifdef WIN32
  #ifndef  _WIN32_WINNT // @todo: remove

include/ITAMutex.h

@@ -21,13 +21,10 @@
 
 #include <ITAUncopyable.h>
 
-<<<<<<< HEAD
 #ifndef  _WIN32_WINNT // @todo: remove
 #define _WIN32_WINNT 0x0500
 #endif
 
-=======
->>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
 #include <windows.h>
 
 /**

include/ITATimer.h

@@ -32,14 +32,11 @@
 #include <Windows.h>
 #endif
 
-<<<<<<< HEAD
 // Weitere Includes
 #ifndef  _WIN32_WINNT // @todo: remove
 #define _WIN32_WINNT 0x0500
 #endif
 
-=======
->>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
 // Vorwrtsdeklarationen
 class ITATimer;
 

src/ITAAtomicOpsWin32Impl.cpp

 #include <ITAAtomicOps.h>
 
-<<<<<<< HEAD
 #ifndef  _WIN32_WINNT // @todo: remove
 #define _WIN32_WINNT 0x0500
 #endif
-=======
->>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
 #include <windows.h>
 
 typedef union

src/ITACriticalSectionWin32Impl.h

@@ -3,12 +3,9 @@
 
 #include "ITACriticalSectionImpl.h"
 
-<<<<<<< HEAD
 #ifndef  _WIN32_WINNT // @todo: remove
 #define _WIN32_WINNT 0x0500
 #endif
-=======
->>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
 #include <windows.h>
 
 class ITACriticalSectionWin32Impl : public ITACriticalSectionImpl

src/ITAHPT.cpp

@@ -12,12 +12,9 @@
 
 #include <cmath>
 
-<<<<<<< HEAD
 #ifndef  _WIN32_WINNT // @todo: remove
 #define _WIN32_WINNT 0x0500
 #endif
-=======
->>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
 #include <windows.h>
 
 #include "ITAException.h"

src/ITAWinPCClock.cpp

@@ -4,12 +4,9 @@
 
 #include <ITAException.h>
 
-<<<<<<< HEAD
 #ifndef  _WIN32_WINNT // @todo: remove
 #define _WIN32_WINNT 0x0500
 #endif
-=======
->>>>>>> e71eb73b43d45b32c4f4050342fe06cf4da2808f
 #include <windows.h>
 
 ITAWinPCClock* ITAWinPCClock::m_pInstance = NULL;