resolve conflivt
This commit is contained in:
committed by
github-actions[bot]
parent
e479e74fbe
commit
0bc3b35901
@@ -1,9 +1,10 @@
|
||||
layout: {qmk_keyboard: corne_rotated, layout_name: LAYOUT_split_3x6_3}
|
||||
layers:
|
||||
default: [↹, Q, W, E, R, T, Y, U, I, O, P, '$$mdi:backspace-outline$$', '$$mdi:apple-keyboard-control$$', A, S, D, F, G, H, J, K, L, ;, ENTER, '$$mdi:apple-keyboard-shift$$',
|
||||
Z, X, C, V, B, N, M, ',', ., /, '$$mdi:apple-keyboard-shift$$', '$$mdi:apple-keyboard-command$$', lower, ␣, ␣, raise, '$$mdi:apple-keyboard-option$$']
|
||||
default: ['$$mdi:keyboard-tab$$', Q, W, E, R, T, Y, U, I, O, P, '$$mdi:backspace-outline$$', '$$mdi:apple-keyboard-control$$', A, S, D, F, G, H, J, K, L, ;, '$$mdi:keyboard-return$$',
|
||||
'$$mdi:apple-keyboard-shift$$', Z, X, C, V, B, N, M, ',', ., /, '$$mdi:apple-keyboard-shift$$', '$$mdi:apple-keyboard-command$$', lower, '$$mdi:keyboard-space$$',
|
||||
'$$mdi:keyboard-space$$', raise, '$$mdi:apple-keyboard-option$$']
|
||||
lower:
|
||||
- ESCAPE
|
||||
- $$mdi:keyboard-esc$$
|
||||
- '1'
|
||||
- '2'
|
||||
- '3'
|
||||
@@ -18,42 +19,42 @@ layers:
|
||||
- $$mdi:apple-keyboard-control$$
|
||||
- ''
|
||||
- ''
|
||||
- Ctl+Sft+↹
|
||||
- Ctl+↹
|
||||
- Ctl+Sft+$$mdi:keyboard-tab$$
|
||||
- Ctl+$$mdi:keyboard-tab$$
|
||||
- Gui+Sft+J
|
||||
- LEFT ARROW
|
||||
- DOWN ARROW
|
||||
- UP ARROW
|
||||
- RIGHT ARROW
|
||||
- $$mdi:arrow-left-bold$$
|
||||
- $$mdi:arrow-down-bold$$
|
||||
- $$mdi:arrow-up-bold$$
|
||||
- $$mdi:arrow-right-bold$$
|
||||
- ''
|
||||
- ENTER
|
||||
- $$mdi:keyboard-return$$
|
||||
- $$mdi:apple-keyboard-shift$$
|
||||
- ''
|
||||
- ''
|
||||
- ''
|
||||
- ''
|
||||
- Gui+Alt+␣
|
||||
- Vol Down
|
||||
- Vol Up
|
||||
- Gui+Alt+$$mdi:keyboard-space$$
|
||||
- $$mdi:volume-low$$
|
||||
- $$mdi:volume-high$$
|
||||
- ''
|
||||
- ''
|
||||
- ''
|
||||
- $$mdi:apple-keyboard-shift$$
|
||||
- $$mdi:apple-keyboard-command$$
|
||||
- {t: lower, type: held}
|
||||
- ␣
|
||||
- ␣
|
||||
- $$mdi:keyboard-space$$
|
||||
- $$mdi:keyboard-space$$
|
||||
- raise
|
||||
- $$mdi:apple-keyboard-option$$
|
||||
raise:
|
||||
- ESCAPE
|
||||
- $$mdi:keyboard-esc$$
|
||||
- '!'
|
||||
- '@'
|
||||
- '#'
|
||||
- $
|
||||
- '%'
|
||||
- ^
|
||||
- AMPERSAND
|
||||
- '&'
|
||||
- '*'
|
||||
- +
|
||||
- '='
|
||||
@@ -69,7 +70,7 @@ layers:
|
||||
- '}'
|
||||
- \
|
||||
- '|'
|
||||
- ENTER
|
||||
- $$mdi:keyboard-return$$
|
||||
- $$mdi:apple-keyboard-shift$$
|
||||
- ''
|
||||
- ''
|
||||
@@ -84,7 +85,7 @@ layers:
|
||||
- $$mdi:apple-keyboard-shift$$
|
||||
- $$mdi:apple-keyboard-command$$
|
||||
- lower
|
||||
- ␣
|
||||
- ␣
|
||||
- $$mdi:keyboard-space$$
|
||||
- $$mdi:keyboard-space$$
|
||||
- {t: raise, type: held}
|
||||
- $$mdi:apple-keyboard-option$$
|
||||
|
||||
Reference in New Issue
Block a user