diff options
| author | Nathan Sharfi <me@ngalt.com> | 2016-07-31 14:02:25 -0700 |
|---|---|---|
| committer | Nathan Sharfi <me@ngalt.com> | 2016-07-31 14:02:25 -0700 |
| commit | d889648d5373b7ff77dc7bc4b369c628e8336b45 (patch) | |
| tree | 35c6eb194417242958baf54b36f0ff3a56e378f1 /keyboard/planck/keymaps/experimental/makefile.mk | |
| parent | 6428069eb70f5cc47ac1f3f9acf3daea14fb9097 (diff) | |
| parent | b25dbc484d639210c53d8e13f79cf5a77f2faaaa (diff) | |
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
# Conflicts:
# keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
# keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
Diffstat (limited to 'keyboard/planck/keymaps/experimental/makefile.mk')
| -rw-r--r-- | keyboard/planck/keymaps/experimental/makefile.mk | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/keyboard/planck/keymaps/experimental/makefile.mk b/keyboard/planck/keymaps/experimental/makefile.mk deleted file mode 100644 index 6c1e05b65a..0000000000 --- a/keyboard/planck/keymaps/experimental/makefile.mk +++ /dev/null @@ -1,5 +0,0 @@ -AUDIO_ENABLE = yes -NKRO_ENABLE = yes -MIDI_ENABLE = yes -BACKLIGHT_ENABLE = no -COMMAND_ENABLE = no
\ No newline at end of file |