From 8f213aefb02247e7192aa56c77a369fb30aceac0 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Fri, 5 Sep 2014 07:49:53 -0400
Subject: [PATCH] missed merge conflict resolution, now fixed

---
 libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c b/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c
index 2021a13eee..af4034c7cc 100644
--- a/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c
+++ b/libs/backends/wavesaudio/portmidi/src/porttime/ptwinmm.c
@@ -2,15 +2,10 @@
 
 
 #include "porttime.h"
-<<<<<<< HEAD
-#include "windows.h"
-#include "time.h"
-=======
+
 #include <windows.h>
 #include <mmsystem.h>
 #include <time.h>
->>>>>>> 41fe637... Add the 'porttime' source file for Windows
-
 
 TIMECAPS caps;