summaryrefslogtreecommitdiff
path: root/keyboards/takashiski
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/takashiski
parent872b521e4f4474ba9a4f4eb640fbdb5a386f2ac4 (diff)
parent764dc18a81f762fdff5f74eb6d3b517ba79d5c11 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/takashiski')
-rw-r--r--keyboards/takashiski/hecomi/alpha/config.h2
-rw-r--r--keyboards/takashiski/namecard2x4/rev1/config.h3
-rw-r--r--keyboards/takashiski/namecard2x4/rev2/config.h3
-rw-r--r--keyboards/takashiski/otaku_split/rev0/config.h2
-rw-r--r--keyboards/takashiski/otaku_split/rev1/config.h2
5 files changed, 0 insertions, 12 deletions
diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h
index 55c5ac50eb..165b815667 100644
--- a/keyboards/takashiski/hecomi/alpha/config.h
+++ b/keyboards/takashiski/hecomi/alpha/config.h
@@ -131,8 +131,6 @@ 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
/* Bootmagic Lite key configuration */
// #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h
index d743c0e339..a91df15b08 100644
--- a/keyboards/takashiski/namecard2x4/rev1/config.h
+++ b/keyboards/takashiski/namecard2x4/rev1/config.h
@@ -112,6 +112,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/takashiski/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h
index 37434d41a0..402737dc71 100644
--- a/keyboards/takashiski/namecard2x4/rev2/config.h
+++ b/keyboards/takashiski/namecard2x4/rev2/config.h
@@ -112,6 +112,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/takashiski/otaku_split/rev0/config.h b/keyboards/takashiski/otaku_split/rev0/config.h
index 454f4866e6..5fab9ea77e 100644
--- a/keyboards/takashiski/otaku_split/rev0/config.h
+++ b/keyboards/takashiski/otaku_split/rev0/config.h
@@ -138,8 +138,6 @@ 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
/* Bootmagic Lite key configuration */
// #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/takashiski/otaku_split/rev1/config.h b/keyboards/takashiski/otaku_split/rev1/config.h
index 7ae6155d8c..05979a6e04 100644
--- a/keyboards/takashiski/otaku_split/rev1/config.h
+++ b/keyboards/takashiski/otaku_split/rev1/config.h
@@ -142,8 +142,6 @@ 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
/* Bootmagic Lite key configuration */
// #define BOOTMAGIC_LITE_ROW 0