summaryrefslogtreecommitdiff
path: root/keyboards/cannonkeys
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-03-04 01:02:37 +0000
committerQMK Bot <hello@qmk.fm>2021-03-04 01:02:37 +0000
commitd3092ced99b5a529c6bde32d8f352cc40abd317d (patch)
tree707d06ae437f088fe77e62b630a5bc9cdcf89d9b /keyboards/cannonkeys
parent6c3af2670e41448432052a44b446c1c7ff3da9a5 (diff)
parent7aa74c227b03e882915b184d07a5e31c9d720710 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/cannonkeys')
-rw-r--r--keyboards/cannonkeys/atlas_alps/keymaps/via/rules.mk (renamed from keyboards/cannonkeys/atlas_alps/keymaps/via/rules.mk.txt)0
1 files changed, 0 insertions, 0 deletions
diff --git a/keyboards/cannonkeys/atlas_alps/keymaps/via/rules.mk.txt b/keyboards/cannonkeys/atlas_alps/keymaps/via/rules.mk
index 036bd6d1c3..036bd6d1c3 100644
--- a/keyboards/cannonkeys/atlas_alps/keymaps/via/rules.mk.txt
+++ b/keyboards/cannonkeys/atlas_alps/keymaps/via/rules.mk