should have fixed conflixed

This commit is contained in:
climbalima committed 2016-11-16 19:49:38 -05:00
1 parent 668c739702
commit 21b6b4e6c4
13 files changed
+10 -268

No files matched your search

-6
View File
@@ -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
}