diff options
| -rw-r--r-- | libs/midi++2/alsa_sequencer_midiport.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libs/midi++2/alsa_sequencer_midiport.cc b/libs/midi++2/alsa_sequencer_midiport.cc index c748bbece0..bf891108c6 100644 --- a/libs/midi++2/alsa_sequencer_midiport.cc +++ b/libs/midi++2/alsa_sequencer_midiport.cc @@ -133,12 +133,7 @@ int ALSA_SequencerMidiPort::write (byte *msg, size_t msglen, timestamp_t timesta return totwritten; } -<<<<<<< .working int ALSA_SequencerMidiPort::read (byte *buf, size_t max, timestamp_t timestamp) -======= -int -ALSA_SequencerMidiPort::read (byte *buf, size_t max) ->>>>>>> .merge-right.r1393 { TR_FN(); int err; |