diff options
| author | dbroqua <dbroqua@mousur.org> | 2017-04-29 15:04:01 +0200 |
|---|---|---|
| committer | dbroqua <dbroqua@mousur.org> | 2017-04-29 15:04:01 +0200 |
| commit | 7180e195e84aabf252fcadb2852644417ac1d663 (patch) | |
| tree | 2a314ac51bf1399c09a394e76ba81a56c072e7d6 /quantum/keymap_extras/keymap_german_ch.h | |
| parent | 838aae164568a1092ae269267f8d8772d3aba781 (diff) | |
| parent | 584b804ee33d53102fef3b8cdd045bca4c47bf26 (diff) | |
Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware
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 |