osxaudio: Fix merge conflicts
This commit is contained in:
parent
12601adbf0
commit
27248393e4
@ -22,11 +22,7 @@
|
||||
*/
|
||||
|
||||
#include "gstosxcoreaudio.h"
|
||||
<<<<<<<
|
||||
#include <gst/audio/multichannel.h>
|
||||
=======
|
||||
#include <gst/audio/audio-channels.h>
|
||||
>>>>>>>
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user