summaryrefslogtreecommitdiffstats
path: root/quantum/keymap_extras
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-06-21 23:54:12 +0200
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-06-21 23:54:12 +0200
commitee3c7892ad585e2e702d8975420d25ae052d97bb (patch)
tree71c23600099fe5670482f8900d787dbc7c9551b2 /quantum/keymap_extras
parent2d314810086684883329af730d8f5e8ecd0506b0 (diff)
parent1a0bac8bccf0e156d2f3c5f14a7214f9677b6370 (diff)
downloadqmk_firmware-ee3c7892ad585e2e702d8975420d25ae052d97bb.tar.gz
qmk_firmware-ee3c7892ad585e2e702d8975420d25ae052d97bb.tar.xz
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.h3
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 b2040a278..f63f06618 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