From 27248393e43ed0db3375e10cb04c7b5cf5705254 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Wed, 17 Apr 2013 20:24:48 +0200
Subject: [PATCH] osxaudio: Fix merge conflicts

---
 sys/osxaudio/gstosxcoreaudiocommon.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sys/osxaudio/gstosxcoreaudiocommon.h b/sys/osxaudio/gstosxcoreaudiocommon.h
index c079e50..e9fbb8e 100644
--- a/sys/osxaudio/gstosxcoreaudiocommon.h
+++ b/sys/osxaudio/gstosxcoreaudiocommon.h
@@ -22,11 +22,7 @@
  */
 
 #include "gstosxcoreaudio.h"
-<<<<<<<
-#include <gst/audio/multichannel.h>
-=======
 #include <gst/audio/audio-channels.h>
->>>>>>>
 
 typedef struct
 {
-- 
2.7.4