Merge https://github.com/climbalima/qmk_firmware

[qmk_firmware.git] / keyboards / lets_split / rev1 / rev1.c

diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c
index c505d3a6e317630df35f0d166a77bf4de841f11e..41dd1e3535501b047309c4594edd1803e3c791b9 100644 (file)
--- a/keyboards/lets_split/rev1/rev1.c
+++ b/keyboards/lets_split/rev1/rev1.c
@@ -24,9 +24,15 @@ 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
 }