diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-21 17:54:12 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-21 17:54:12 -0400 |
| commit | ee3c7892ad585e2e702d8975420d25ae052d97bb (patch) | |
| tree | 71c23600099fe5670482f8900d787dbc7c9551b2 /quantum/keymap_extras | |
| parent | 2d314810086684883329af730d8f5e8ecd0506b0 (diff) | |
| parent | 1a0bac8bccf0e156d2f3c5f14a7214f9677b6370 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/keymap_extras')
| -rw-r--r-- | quantum/keymap_extras/keymap_german_osx.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/quantum/keymap_extras/keymap_german_osx.h b/quantum/keymap_extras/keymap_german_osx.h index b2040a278a..f63f066183 100644 --- a/quantum/keymap_extras/keymap_german_osx.h +++ b/quantum/keymap_extras/keymap_german_osx.h @@ -1,9 +1,6 @@ #ifndef KEYMAP_GERMAN_OSX #define KEYMAP_GERMAN_OSX -#ifdef KEYMAP_GERMAN - #warning redefining german keys -#endif #include "keymap.h" // Alt gr |