osxaudio: Fix merge conflicts

2013-04-17 20:24:48 +02:00 · 2013-04-17 20:24:48 +02:00 · 27248393e4
commit 27248393e4
parent 12601adbf0
1 changed files with 0 additions and 4 deletions
--- 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
 {