summaryrefslogtreecommitdiffstats
path: root/keyboards/lets_split/rev1/rev1.c
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/lets_split/rev1/rev1.c')
-rw-r--r--keyboards/lets_split/rev1/rev1.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c
index 41dd1e353..c505d3a6e 100644
--- a/keyboards/lets_split/rev1/rev1.c
+++ b/keyboards/lets_split/rev1/rev1.c
@@ -24,15 +24,9 @@ void matrix_init_kb(void) {
};
void shutdown_user(void) {
-<<<<<<< HEAD
#ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
_delay_ms(150);
stop_all_notes();
#endif
-=======
- PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
- _delay_ms(150);
- stop_all_notes();
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
}