summaryrefslogtreecommitdiff
path: root/keyboards/ergodox/keymaps/supercoder/config.h
diff options
context:
space:
mode:
authorNathan Sharfi2016-07-31 14:02:25 -0700
committerNathan Sharfi2016-07-31 14:02:25 -0700
commitd889648d5373b7ff77dc7bc4b369c628e8336b45 (patch)
tree35c6eb194417242958baf54b36f0ff3a56e378f1 /keyboards/ergodox/keymaps/supercoder/config.h
parent6428069eb70f5cc47ac1f3f9acf3daea14fb9097 (diff)
parentb25dbc484d639210c53d8e13f79cf5a77f2faaaa (diff)
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
# Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
Diffstat (limited to 'keyboards/ergodox/keymaps/supercoder/config.h')
-rw-r--r--keyboards/ergodox/keymaps/supercoder/config.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/keyboards/ergodox/keymaps/supercoder/config.h b/keyboards/ergodox/keymaps/supercoder/config.h
new file mode 100644
index 000000000..2de3599f8
--- /dev/null
+++ b/keyboards/ergodox/keymaps/supercoder/config.h
@@ -0,0 +1,9 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H 1
+
+#include "../../config.h"
+
+#undef LOCKING_SUPPORT_ENABLE
+#undef LOCKING_RESYNC_ENABLE
+
+#endif