diff options
| author | Drashna Jael're <drashna@live.com> | 2022-03-25 16:31:52 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2022-03-25 16:31:52 -0700 |
| commit | 07a3743e878e92a9236736a65d167de26478def6 (patch) | |
| tree | 4293dd7c12bfdb193519621ac4887291d32081f5 /quantum/audio | |
| parent | 53ff570bf068e04740f187163774327839dfa68b (diff) | |
Fix compilation issues
Diffstat (limited to 'quantum/audio')
| -rw-r--r-- | quantum/audio/voices.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c index 4b7d14171f..eb860a7ef4 100644 --- a/quantum/audio/voices.c +++ b/quantum/audio/voices.c @@ -36,10 +36,6 @@ void set_voice(voice_type v) { voice = v; } -<<<<<<< HEAD -void voice_iterate() { voice = (voice + 1) % number_of_voices; } -void voice_deiterate() { voice = (voice - 1 + number_of_voices) % number_of_voices; } -======= void voice_iterate() { voice = (voice + 1) % number_of_voices; } @@ -47,7 +43,6 @@ void voice_iterate() { void voice_deiterate() { voice = (voice - 1 + number_of_voices) % number_of_voices; } ->>>>>>> qmk/master #ifdef AUDIO_VOICES float mod(float a, int b) { |