diff options
| author | Drashna Jael're <drashna@live.com> | 2022-05-29 15:51:46 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2022-05-29 15:51:46 -0700 |
| commit | 3e44377af015df3f42927bc4a5fe1146cc764aed (patch) | |
| tree | e771c83f93718210c943c174d9e55ea010d58d61 /keyboards/ergodox_ez/keymaps | |
| parent | 30aac80d5a6d8c6f7c06efb49189d748e70edc4a (diff) | |
Fix compilation issues with merge
Diffstat (limited to 'keyboards/ergodox_ez/keymaps')
| -rw-r--r-- | keyboards/ergodox_ez/keymaps/oryx/keymap.c | 6 | ||||
| -rw-r--r-- | keyboards/ergodox_ez/keymaps/webusb/keymap.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/ergodox_ez/keymaps/oryx/keymap.c b/keyboards/ergodox_ez/keymaps/oryx/keymap.c index f3190852cd..e7318adfc3 100644 --- a/keyboards/ergodox_ez/keymaps/oryx/keymap.c +++ b/keyboards/ergodox_ez/keymaps/oryx/keymap.c @@ -6,10 +6,10 @@ #include "keymap_spanish.h" #include "keymap_hungarian.h" #include "keymap_swedish.h" -#include "keymap_br_abnt2.h" +#include "keymap_brazilian_abnt2.h" #include "keymap_canadian_multilingual.h" -#include "keymap_german_ch.h" -#include "keymap_jp.h" +#include "keymap_swiss_de.h" +#include "keymap_japanese.h" #define KC_MAC_UNDO LGUI(KC_Z) #define KC_MAC_CUT LGUI(KC_X) diff --git a/keyboards/ergodox_ez/keymaps/webusb/keymap.c b/keyboards/ergodox_ez/keymaps/webusb/keymap.c index d37cc49fc3..435c7612ab 100644 --- a/keyboards/ergodox_ez/keymaps/webusb/keymap.c +++ b/keyboards/ergodox_ez/keymaps/webusb/keymap.c @@ -6,10 +6,10 @@ #include "keymap_spanish.h" #include "keymap_hungarian.h" #include "keymap_swedish.h" -#include "keymap_br_abnt2.h" +#include "keymap_brazilian_abnt2.h" #include "keymap_canadian_multilingual.h" -#include "keymap_german_ch.h" -#include "keymap_jp.h" +#include "keymap_swiss_de.h" +#include "keymap_japanese.h" #define KC_MAC_UNDO LGUI(KC_Z) #define KC_MAC_CUT LGUI(KC_X) |