summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-01-11 00:51:40 +0000
committerQMK Bot <hello@qmk.fm>2022-01-11 00:51:40 +0000
commita5a3918856a53ec4fb7e93f0d1762282b0de512a (patch)
tree763902b16aa9b8960bc8da22a6ecbfe734cc6ff7
parent6ed4f51413ef0a933ea5b6d8a086aabf159b0e0e (diff)
parentcb821b5f16c6b8aa79f1f6e1310b0654ae72079d (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h (renamed from keyboards/kprepublic/bm60hsrgb_poker/keymaps/carlosala/config.h)0
-rw-r--r--keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/keymap.c (renamed from keyboards/kprepublic/bm60hsrgb_poker/keymaps/carlosala/keymap.c)0
-rw-r--r--keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk (renamed from keyboards/kprepublic/bm60hsrgb_poker/keymaps/carlosala/rules.mk)0
3 files changed, 0 insertions, 0 deletions
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/carlosala/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
index b8dea6a76a..b8dea6a76a 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/carlosala/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/carlosala/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/keymap.c
index 6cd5741786..6cd5741786 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/carlosala/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/keymap.c
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/carlosala/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk
index fd581f26db..fd581f26db 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/carlosala/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk