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;