drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

should have fixed conflixed

Browse source
This commit is contained in:
climbalima 2016-11-16 19:49:38 -05:00
parent 668c739702
commit 21b6b4e6c4
13 changed files with 10 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

6
keyboards/lets_split/rev1/rev1.c
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
}