From 7ee9726c899fe5d959473dfc0b8b9d018aecf1a2 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Tue, 21 Apr 2015 08:37:54 -0500 Subject: [PATCH] another merge fix --- libs/backends/wavesaudio/waves_audiobackend.midi.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libs/backends/wavesaudio/waves_audiobackend.midi.cc b/libs/backends/wavesaudio/waves_audiobackend.midi.cc index 47efd2d860..296f3564f9 100644 --- a/libs/backends/wavesaudio/waves_audiobackend.midi.cc +++ b/libs/backends/wavesaudio/waves_audiobackend.midi.cc @@ -31,11 +31,7 @@ const std::vector WavesAudioBackend::__available_midi_options = boo #elif PLATFORM_WINDOWS -<<<<<<< HEAD const std::vector WavesAudioBackend::__available_midi_options = boost::assign::list_of ("System MIDI (MME)") ("None"); -======= -const std::vector WavesAudioBackend::__available_midi_options = boost::assign::list_of ("Multimedia Extensions") ("None"); ->>>>>>> remotes/origin/tempo-marker-from-clock #endif -- 2.30.2