diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-20 12:20:52 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-20 12:20:52 -0400 |
| commit | f6d1ce7863893e6dd0233c57f04b262f6808d78a (patch) | |
| tree | 723db2fdaff2ccf810a328511d7f54cbc568d326 /keyboard/ergodox_ez/keymaps | |
| parent | f566125c6e29e3db62552c089428591d460ce583 (diff) | |
| parent | 44e098ef2d6c571cee9e5fa1b007b40f6289852f (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/ergodox_ez/keymaps')
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c | 2 | ||||
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/townk_osx/keymap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c b/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c index d8911af412..131796fc5d 100644 --- a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c +++ b/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c @@ -1,6 +1,6 @@ #include "ergodox_ez.h" #include "action_layer.h" -#include "keymap_common.h" +#include "keymap.h" #include "keymap_extras/keymap_german.h" #define UC_ASYMPTOTICALLY_EQUAL_TO 0 diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c b/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c index b63698ec6a..07e58a491b 100644 --- a/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c +++ b/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c @@ -3,7 +3,7 @@ #include "action_layer.h" #include "action_util.h" #include "led.h" -#include "keymap_common.h" +#include "keymap.h" #include "timer.h" /* |