Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-04-18 22:40:16 +00:00
commit 0a9e18fae1

View file

@ -45,7 +45,7 @@ LAYOUT(
* ,-------------------------------------------------------------------------. * ,-------------------------------------------------------------------------.
* | ` ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Delete| * | ` ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Delete|
* |-------------------------------------------------------------------------+ * |-------------------------------------------------------------------------+
* | | | | | | | | - | = | [ | ] | \ | * | | RGB |RGBMO|BRT+ |BRT- | | | - | = | [ | ] | \ |
* |-------------------------------------------------------------------------+ * |-------------------------------------------------------------------------+
* | | F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | | * | | F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 | |
* |-------------------------------------------------------------------------+ * |-------------------------------------------------------------------------+
@ -79,7 +79,7 @@ LAYOUT( /* Left */
_______, _______, _______, KC_CAPS, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END _______, _______, _______, KC_CAPS, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
), ),
/* FN Layer 2 /* FN Layer 3
* ,-------------------------------------------------------------------------. * ,-------------------------------------------------------------------------.
* | Esc | Calc|Webhm| Mail| Comp| | | | | |PrtSc| | * | Esc | Calc|Webhm| Mail| Comp| | | | | |PrtSc| |
* |-------------------------------------------------------------------------+ * |-------------------------------------------------------------------------+