From fb7d90147cf8009a16a95113fde3d737cc4a8e22 Mon Sep 17 00:00:00 2001
From: richardash1981 <richardash1981@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Mon, 4 Oct 2010 18:27:02 +0000
Subject: [PATCH] This line should have been edited out during merge

---
 lib-src/portaudio-v19/src/hostapi/dsound/pa_win_ds.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib-src/portaudio-v19/src/hostapi/dsound/pa_win_ds.c b/lib-src/portaudio-v19/src/hostapi/dsound/pa_win_ds.c
index c27655476..83c832b47 100644
--- a/lib-src/portaudio-v19/src/hostapi/dsound/pa_win_ds.c
+++ b/lib-src/portaudio-v19/src/hostapi/dsound/pa_win_ds.c
@@ -2066,7 +2066,6 @@ static PaError OpenStream( struct PaUtilHostApiRepresentation *hostApi,
                                        (WORD)outputParameters->channelCount, bytesPerDirectSoundOutputBuffer,
                                        outputChannelMask );
             DBUG(("InitOutputBuffer() returns %x\n", hr));
->>>>>>> .merge-right.r10709
             if( hr != DS_OK )
             {
                 result = paUnanticipatedHostError;