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/edi | |
| parent | 872b521e4f4474ba9a4f4eb640fbdb5a386f2ac4 (diff) | |
| parent | 764dc18a81f762fdff5f74eb6d3b517ba79d5c11 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/edi')
| -rw-r--r-- | keyboards/edi/hardlight/mk2/config.h | 2 | ||||
| -rw-r--r-- | keyboards/edi/standaside/config.h | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h index ab4b006827..8580aabec5 100644 --- a/keyboards/edi/hardlight/mk2/config.h +++ b/keyboards/edi/hardlight/mk2/config.h @@ -77,5 +77,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/edi/standaside/config.h b/keyboards/edi/standaside/config.h index 797a463a15..c72c915d82 100644 --- a/keyboards/edi/standaside/config.h +++ b/keyboards/edi/standaside/config.h @@ -99,6 +99,3 @@ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION - |