diff options
author | coderkun <olli@coderkun.de> | 2017-05-06 12:19:45 +0200 |
---|---|---|
committer | coderkun <olli@coderkun.de> | 2017-05-06 12:19:45 +0200 |
commit | 49046f621bc8304c8c7ba7a065d2568f45ecc616 (patch) | |
tree | 4a1fc5d37e012502ff4732c801381eec814a2e01 /quantum/keymap_extras/keymap_german_ch.h | |
parent | 9e7448ea89a1a88317f0acb805819af79d0a76e3 (diff) | |
parent | c5cef025ec39e67408f000825747d88c6aaa86eb (diff) |
Merge tag '0.5.43' into coderkun_neo2
Diffstat (limited to 'quantum/keymap_extras/keymap_german_ch.h')
-rw-r--r-- | quantum/keymap_extras/keymap_german_ch.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/quantum/keymap_extras/keymap_german_ch.h b/quantum/keymap_extras/keymap_german_ch.h index 8332e00af3..67350d6602 100644 --- a/quantum/keymap_extras/keymap_german_ch.h +++ b/quantum/keymap_extras/keymap_german_ch.h @@ -33,6 +33,10 @@ #define CH_E KC_E #define CH_F KC_F #define CH_G KC_G +#ifdef CH_H +// The ChibiOS ch.h file defines this... +#undef CH_H +#endif #define CH_H KC_H #define CH_I KC_I #define CH_J KC_J |