diff options
author | QMK Bot <hello@qmk.fm> | 2021-09-24 23:28:56 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-09-24 23:28:56 +0000 |
commit | cf7b59389e3cbe7c304954d7b3b2068be5c99892 (patch) | |
tree | a47995153e2a4e9c71efcafb515e0522ccdf2de9 | |
parent | 3a2a39e5ecd43756b5df5e382bd02d9f41061c78 (diff) | |
parent | 9e87b47a9cc0e560258009bc2448dc3e43c369b5 (diff) | |
download | qmk_firmware-cf7b59389e3cbe7c304954d7b3b2068be5c99892.tar.gz qmk_firmware-cf7b59389e3cbe7c304954d7b3b2068be5c99892.zip |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | keyboards/aozora/hotswap/info.json | 3 | ||||
-rw-r--r-- | keyboards/aozora/hotswap/readme.md | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/keyboards/aozora/hotswap/info.json b/keyboards/aozora/hotswap/info.json index 0d670f2c7..dbceb3b37 100644 --- a/keyboards/aozora/hotswap/info.json +++ b/keyboards/aozora/hotswap/info.json | |||
@@ -1,7 +1,7 @@ | |||
1 | { | 1 | { |
2 | "keyboard_name": "Aozora", | 2 | "keyboard_name": "Aozora", |
3 | "url": "https://salmoncat.studio/pages/aozora-%E9%9D%92%E7%A9%BA-6-9-21-7-10-21", | 3 | "url": "https://salmoncat.studio/pages/aozora-%E9%9D%92%E7%A9%BA-6-9-21-7-10-21", |
4 | "maintainer": "Food", | 4 | "maintainer": "Phooood", |
5 | "layouts": { | 5 | "layouts": { |
6 | "LAYOUT": { | 6 | "LAYOUT": { |
7 | "layout": [ | 7 | "layout": [ |
@@ -77,5 +77,4 @@ | |||
77 | ] | 77 | ] |
78 | } | 78 | } |
79 | } | 79 | } |
80 | ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/" | ||
81 | } | 80 | } |
diff --git a/keyboards/aozora/hotswap/readme.md b/keyboards/aozora/hotswap/readme.md index 201ae3a73..157b58c0b 100644 --- a/keyboards/aozora/hotswap/readme.md +++ b/keyboards/aozora/hotswap/readme.md | |||
@@ -1,6 +1,6 @@ | |||
1 | # Aozora | 1 | # Aozora |
2 | 2 | ||
3 | A 65%-Style 6-Key keyboard featuring a cloud-shaped badge. | 3 | A 65%-style 69-key keyboard featuring a cloud-shaped badge. |
4 | 4 | ||
5 |  | 5 |  |
6 | 6 | ||
@@ -14,4 +14,4 @@ Make example for this keyboard (after setting up your build environment): | |||
14 | 14 | ||
15 | To reset, press the button on the back of the PCB. | 15 | To reset, press the button on the back of the PCB. |
16 | 16 | ||
17 | See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). \ No newline at end of file | 17 | See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). |