summaryrefslogtreecommitdiffstats
path: root/keyboards/lets_split/rev1/rev1.c
diff options
context:
space:
mode:
authorclimbalima <climbalima@gmail.com>2016-11-16 19:26:38 -0500
committerclimbalima <climbalima@gmail.com>2016-11-16 19:26:38 -0500
commit5cac51a773bef7fc8064390ac3ee499121a9611d (patch)
tree765b36006bb3d60f51dd0af27e89dac7bce2a59b /keyboards/lets_split/rev1/rev1.c
parent1dd6ceb45dfcf5f0991b84fea5a761a35df7fcda (diff)
parentbce6e52391da7c5f620c96a91857940f0dee19df (diff)
Merge https://github.com/climbalima/qmk_firmware
Diffstat (limited to 'keyboards/lets_split/rev1/rev1.c')
-rw-r--r--keyboards/lets_split/rev1/rev1.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c
index c505d3a6e3..41dd1e3535 100644
--- 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
}