summaryrefslogtreecommitdiff
path: root/keyboards/ergodox_ez
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-03-15 13:57:46 +0000
committerQMK Bot <hello@qmk.fm>2022-03-15 13:57:46 +0000
commit5f817a1d7fb525003413167b4471eaebd2099b78 (patch)
tree8f823c83de85418b50502d15d0d6b3906c5a886d /keyboards/ergodox_ez
parent872b521e4f4474ba9a4f4eb640fbdb5a386f2ac4 (diff)
parent764dc18a81f762fdff5f74eb6d3b517ba79d5c11 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/ergodox_ez')
-rw-r--r--keyboards/ergodox_ez/config.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index 109a80d2c5..f25ff162cd 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -205,6 +205,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
+
//#define DEBUG_MATRIX_SCAN_RATE