diff options
| author | Didier Loiseau <didierloiseau+git@gmail.com> | 2016-09-11 02:19:55 +0200 |
|---|---|---|
| committer | Didier Loiseau <didierloiseau+git@gmail.com> | 2016-09-11 02:19:55 +0200 |
| commit | 1aeb59335f2fe67613df25308a630ca453975ac0 (patch) | |
| tree | a3c69625ce8dbf0c2e1ef8fe48213d03d0341a07 | |
| parent | b9014c757599ca288be07629ad1d00ef66c033f1 (diff) | |
| download | qmk_firmware-1aeb59335f2fe67613df25308a630ca453975ac0.tar.gz qmk_firmware-1aeb59335f2fe67613df25308a630ca453975ac0.zip | |
Fixed compilation issues after the merge
| -rw-r--r-- | keyboards/ergodox/keymaps/bepo_csa/keymap.c (renamed from keyboard/ergodox_ez/keymaps/bepo/keymap.c) | 2 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_canadian_multilingual.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/keymaps/bepo/keymap.c b/keyboards/ergodox/keymaps/bepo_csa/keymap.c index 7097d641d9..495242adb3 100644 --- a/keyboard/ergodox_ez/keymaps/bepo/keymap.c +++ b/keyboards/ergodox/keymaps/bepo_csa/keymap.c @@ -1,5 +1,5 @@ /* TypeMatrix-2030-like keymap */ -#include "ergodox_ez.h" +#include "ergodox.h" #include "debug.h" #include "action_layer.h" #include "action_util.h" diff --git a/quantum/keymap_extras/keymap_canadian_multilingual.h b/quantum/keymap_extras/keymap_canadian_multilingual.h index c720088e8c..0bc20c7b9c 100644 --- a/quantum/keymap_extras/keymap_canadian_multilingual.h +++ b/quantum/keymap_extras/keymap_canadian_multilingual.h @@ -1,7 +1,7 @@ #ifndef KEYMAP_CANADIAN_MULTILINGUAG_H #define KEYMAP_CANADIAN_MULTILINGUAG_H -#include "keymap_common.h" +#include "keymap.h" // Alt gr #ifndef ALTGR |