summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-07-30 23:15:44 +0000
committerQMK Bot <hello@qmk.fm>2021-07-30 23:15:44 +0000
commit99fc2173a4b9ded987c3a5b496a614744eea946c (patch)
tree396705e73266eaa46787a62cccb2f1b52501ffa4 /keyboards
parentf1af7da9ba8834e800b4fe7c76198571c10fc3ec (diff)
parentaddb389a5e384f1db927610087c9258589b50f20 (diff)
downloadqmk_firmware-99fc2173a4b9ded987c3a5b496a614744eea946c.tar.gz
qmk_firmware-99fc2173a4b9ded987c3a5b496a614744eea946c.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ergosaurus/keymaps/via/keymap.c (renamed from keyboards/ergosaurus/keymaps/default/via/keymap.c)0
-rw-r--r--keyboards/ergosaurus/keymaps/via/rules.mk (renamed from keyboards/ergosaurus/keymaps/default/via/rules.mk)0
2 files changed, 0 insertions, 0 deletions
diff --git a/keyboards/ergosaurus/keymaps/default/via/keymap.c b/keyboards/ergosaurus/keymaps/via/keymap.c
index 5ae73bfd47..5ae73bfd47 100644
--- a/keyboards/ergosaurus/keymaps/default/via/keymap.c
+++ b/keyboards/ergosaurus/keymaps/via/keymap.c
diff --git a/keyboards/ergosaurus/keymaps/default/via/rules.mk b/keyboards/ergosaurus/keymaps/via/rules.mk
index 36b7ba9cbc..36b7ba9cbc 100644
--- a/keyboards/ergosaurus/keymaps/default/via/rules.mk
+++ b/keyboards/ergosaurus/keymaps/via/rules.mk