summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-07-20 00:27:04 +0000
committerQMK Bot <hello@qmk.fm>2021-07-20 00:27:04 +0000
commitf493f560cc85585b336930ca551a44df10aab90c (patch)
tree4750dce0c8b9dc9e06a7f11f64decf7febc8b45e
parent85c4672981324817b1cb773f30b709cfff7edc47 (diff)
parent046429fa87ab26bd131c262e590aa6cd03dd9f75 (diff)
downloadqmk_firmware-f493f560cc85585b336930ca551a44df10aab90c.tar.gz
qmk_firmware-f493f560cc85585b336930ca551a44df10aab90c.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/knobgoblin/keymaps/default/keymap.c (renamed from keyboards/knobgoblin/keymaps/ortho/keymap.c)0
-rw-r--r--keyboards/knobgoblin/keymaps/default/readme.md (renamed from keyboards/knobgoblin/keymaps/ortho/readme.md)0
2 files changed, 0 insertions, 0 deletions
diff --git a/keyboards/knobgoblin/keymaps/ortho/keymap.c b/keyboards/knobgoblin/keymaps/default/keymap.c
index 8c2955ea7f..8c2955ea7f 100644
--- a/keyboards/knobgoblin/keymaps/ortho/keymap.c
+++ b/keyboards/knobgoblin/keymaps/default/keymap.c
diff --git a/keyboards/knobgoblin/keymaps/ortho/readme.md b/keyboards/knobgoblin/keymaps/default/readme.md
index 9a37b43c63..9a37b43c63 100644
--- a/keyboards/knobgoblin/keymaps/ortho/readme.md
+++ b/keyboards/knobgoblin/keymaps/default/readme.md