diff options
author | QMK Bot <hello@qmk.fm> | 2022-03-15 13:57:46 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-03-15 13:57:46 +0000 |
commit | 5f817a1d7fb525003413167b4471eaebd2099b78 (patch) | |
tree | 8f823c83de85418b50502d15d0d6b3906c5a886d /keyboards/woodkeys | |
parent | 872b521e4f4474ba9a4f4eb640fbdb5a386f2ac4 (diff) | |
parent | 764dc18a81f762fdff5f74eb6d3b517ba79d5c11 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/woodkeys')
-rw-r--r-- | keyboards/woodkeys/meira/featherble/config.h | 2 | ||||
-rw-r--r-- | keyboards/woodkeys/meira/promicro/config.h | 2 | ||||
-rw-r--r-- | keyboards/woodkeys/scarletbandana/config.h | 3 |
3 files changed, 0 insertions, 7 deletions
diff --git a/keyboards/woodkeys/meira/featherble/config.h b/keyboards/woodkeys/meira/featherble/config.h index 94bef3b330..44f294a06a 100644 --- a/keyboards/woodkeys/meira/featherble/config.h +++ b/keyboards/woodkeys/meira/featherble/config.h @@ -93,5 +93,3 @@ 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 diff --git a/keyboards/woodkeys/meira/promicro/config.h b/keyboards/woodkeys/meira/promicro/config.h index bbdaa9dbd8..1b9b099d1a 100644 --- a/keyboards/woodkeys/meira/promicro/config.h +++ b/keyboards/woodkeys/meira/promicro/config.h @@ -84,5 +84,3 @@ 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 diff --git a/keyboards/woodkeys/scarletbandana/config.h b/keyboards/woodkeys/scarletbandana/config.h index b9c8dd9b0f..3afbfeae84 100644 --- a/keyboards/woodkeys/scarletbandana/config.h +++ b/keyboards/woodkeys/scarletbandana/config.h @@ -51,7 +51,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define NO_MUSIC_MODE #endif -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION - #define DEBOUNCE 5 |