diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2015-04-21 08:37:54 -0500 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2015-04-21 08:37:54 -0500 |
| commit | 7ee9726c899fe5d959473dfc0b8b9d018aecf1a2 (patch) | |
| tree | 988efded44f7a415307200943abbb123336ad1b9 | |
| parent | 91fac4c96dc6210dcc056da70dc608700d7eb570 (diff) | |
another merge fix
| -rw-r--r-- | libs/backends/wavesaudio/waves_audiobackend.midi.cc | 4 |
1 files changed, 0 insertions, 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<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 |