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

2016-11-16 19:26:38 -05:00 · 2016-11-16 19:26:38 -05:00 · 5cac51a773
commit 5cac51a773
parent 1dd6ceb45d bce6e52391
14 changed files with 278 additions and 29 deletions
--- 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
 }