diff options
| author | QMK Bot <hello@qmk.fm> | 2021-01-13 04:53:32 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-01-13 04:53:32 +0000 |
| commit | 6155987d9f582f4341f33ac3c4498b6417dbc67a (patch) | |
| tree | bdea5d735b9af4ab71e253b8139a08865df61381 /quantum | |
| parent | 1ade5aa9229b0dcf755e8d41b828d44767a9e6a8 (diff) | |
| parent | 09835033da0c20412de3ac8ec48117ef1413c6a5 (diff) | |
| download | qmk_firmware-6155987d9f582f4341f33ac3c4498b6417dbc67a.tar.gz qmk_firmware-6155987d9f582f4341f33ac3c4498b6417dbc67a.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/keymap_extras/keymap_fr_ch.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/quantum/keymap_extras/keymap_fr_ch.h b/quantum/keymap_extras/keymap_fr_ch.h index 02ee22a12e..783880c113 100644 --- a/quantum/keymap_extras/keymap_fr_ch.h +++ b/quantum/keymap_extras/keymap_fr_ch.h @@ -20,6 +20,11 @@ // clang-format off +#ifdef CH_H +// The ChibiOS ch.h file defines this... +# undef CH_H +#endif + /* * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ * │ § │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ ' │ ^ │ │ |