diff options
| author | Alex Ong <the.onga@gmail.com> | 2019-01-26 12:13:19 +1100 |
|---|---|---|
| committer | Alex Ong <the.onga@gmail.com> | 2019-01-26 12:13:19 +1100 |
| commit | c9ba618654417ec115809a031d315f8327c79ad4 (patch) | |
| tree | cd5b907af5bebde7062897ff847e473232ed1214 /keyboards/planck/keymaps/brandon | |
| parent | 2bb2977c133646c4e056960e72029270d77cc1eb (diff) | |
| parent | d977daa8dc9136746425f9e1414e1f93cb161877 (diff) | |
DO NOT USE Merge branch 'master' into debounce_refactor
Merged, however now there are two debounce.h and debounce.c to mess around with and coalesce.
# Conflicts:
# quantum/matrix.c
Diffstat (limited to 'keyboards/planck/keymaps/brandon')
| -rw-r--r-- | keyboards/planck/keymaps/brandon/rules.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/keyboards/planck/keymaps/brandon/rules.mk b/keyboards/planck/keymaps/brandon/rules.mk index 6df206578c..30275cf1f6 100644 --- a/keyboards/planck/keymaps/brandon/rules.mk +++ b/keyboards/planck/keymaps/brandon/rules.mk @@ -10,6 +10,3 @@ MOUSEKEY_ENABLE = yes CONSOLE_ENABLE = no BACKLIGHT_ENABLE = yes -ifndef QUANTUM_DIR - include ../../../../Makefile -endif |