diff options
| author | Adam Lee <adam@bigtuna.io> | 2017-05-07 14:36:10 -0700 |
|---|---|---|
| committer | Adam Lee <adam@bigtuna.io> | 2017-05-07 14:36:10 -0700 |
| commit | f2fcab96a8dd8cc70d6785da76621c48df1af94c (patch) | |
| tree | 9be0967ab0d3795e6d20299988c84280f3ad98f6 /quantum/keymap_extras | |
| parent | f90321bdcbcbd196ee642cdd8cc31aa0f6ac121e (diff) | |
| parent | 2704c163da590d3020f6d87717c400611de81110 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'quantum/keymap_extras')
| -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 |