resolve conflivt
This commit is contained in:
committed by
github-actions[bot]
parent
9083b67844
commit
b927b7539e
@@ -439,8 +439,8 @@ parse_config:
|
||||
|
||||
RC(RS(TAB)): "↤"
|
||||
RC(TAB): "↦"
|
||||
LG(LS(J)): "✢"
|
||||
LG(LA(SPACE)): "‡"
|
||||
LG(LS(J)): "Cmd + Shift + J"
|
||||
LG(LA(SPACE)): "Cmd + Opt + ⎵"
|
||||
LOWER: "⤓"
|
||||
RAISE: "⤒"
|
||||
|
||||
|
||||
@@ -520,7 +520,9 @@ rect.held, rect.combo.held {
|
||||
</g>
|
||||
<g transform="translate(308, 98)" class="key keypos-17">
|
||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||
<text x="0" y="0" class="key tap">✢</text>
|
||||
<text x="0" y="0" class="key tap">
|
||||
<tspan x="0" dy="-1.2em">Cmd</tspan><tspan x="0" dy="1.2em">+</tspan><tspan x="0" dy="1.2em">…</tspan>
|
||||
</text>
|
||||
</g>
|
||||
<g transform="translate(532, 98)" class="key keypos-18">
|
||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||
@@ -563,7 +565,9 @@ rect.held, rect.combo.held {
|
||||
</g>
|
||||
<g transform="translate(308, 154)" class="key keypos-29">
|
||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||
<text x="0" y="0" class="key tap">‡</text>
|
||||
<text x="0" y="0" class="key tap">
|
||||
<tspan x="0" dy="-1.2em">Cmd</tspan><tspan x="0" dy="1.2em">+</tspan><tspan x="0" dy="1.2em">…</tspan>
|
||||
</text>
|
||||
</g>
|
||||
<g transform="translate(532, 154)" class="key keypos-30">
|
||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||
|
||||
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
@@ -21,7 +21,7 @@ layers:
|
||||
- ''
|
||||
- ↤
|
||||
- ↦
|
||||
- ✢
|
||||
- Cmd + Shift + J
|
||||
- $$mdi:arrow-left-bold$$
|
||||
- $$mdi:arrow-down-bold$$
|
||||
- $$mdi:arrow-up-bold$$
|
||||
@@ -33,7 +33,7 @@ layers:
|
||||
- ''
|
||||
- ''
|
||||
- ''
|
||||
- ‡
|
||||
- Cmd + Opt + ⎵
|
||||
- $$mdi:volume-low$$
|
||||
- $$mdi:volume-high$$
|
||||
- ''
|
||||
|
||||
Reference in New Issue
Block a user