From 07a3743e878e92a9236736a65d167de26478def6 Mon Sep 17 00:00:00 2001
From: Drashna Jael're <drashna@live.com>
Date: Fri, 25 Mar 2022 16:31:52 -0700
Subject: Fix compilation issues

---
 quantum/audio/voices.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'quantum/audio')

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) {
-- 
cgit v1.2.3