diff options
| author | climbalima <climbalima@gmail.com> | 2016-11-17 01:49:38 +0100 |
|---|---|---|
| committer | climbalima <climbalima@gmail.com> | 2016-11-17 01:49:38 +0100 |
| commit | 21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60 (patch) | |
| tree | 4d51176d38e38de3aed6e69d45ce1f742be279ba /keyboards/lets_split/rev2/rev2.c | |
| parent | 668c7397023ad5c9d338b2165699af453f84af0a (diff) | |
| download | qmk_firmware-21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60.tar.gz qmk_firmware-21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60.tar.xz | |
should have fixed conflixed
Diffstat (limited to 'keyboards/lets_split/rev2/rev2.c')
| -rw-r--r-- | keyboards/lets_split/rev2/rev2.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/keyboards/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c index 41dd1e353..c505d3a6e 100644 --- a/keyboards/lets_split/rev2/rev2.c +++ b/keyboards/lets_split/rev2/rev2.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 } |