another merge fix

[ardour.git] / libs / backends / wavesaudio / waves_audiobackend.midi.cc

diff --git a/libs/backends/wavesaudio/waves_audiobackend.midi.cc b/libs/backends/wavesaudio/waves_audiobackend.midi.cc
index 47efd2d8601ff798ec0b2dd73271e0989b768ece..296f3564f9d4a8bb870fda2f8bf475dafbe7f489 100644 (file)
--- a/libs/backends/wavesaudio/waves_audiobackend.midi.cc
+++ b/libs/backends/wavesaudio/waves_audiobackend.midi.cc
@@ -31,11 +31,7 @@ const std::vector<std::string> WavesAudioBackend::__available_midi_options = boo
 
 #elif PLATFORM_WINDOWS
 
-<<<<<<< HEAD
 const std::vector<std::string> WavesAudioBackend::__available_midi_options = boost::assign::list_of ("System MIDI (MME)") ("None");
-=======
-const std::vector<std::string> WavesAudioBackend::__available_midi_options = boost::assign::list_of ("Multimedia Extensions") ("None");
->>>>>>> remotes/origin/tempo-marker-from-clock
 
 #endif