fix merge conflicts

This commit is contained in:
= 2020-07-12 17:37:55 +01:00
commit 9ab1ebcc2b
2 changed files with 16 additions and 10 deletions

View File

@ -3,9 +3,7 @@
#
# focus or send to the given desktop
super + {_,shift + }{1-9,0}
bspc {desktop -f,node -d} '{I,II,III,IV,V,VI,VII,VIII,IX,X}'
super + {_,shift + }{F1,F2,F3,F4}
bspc {desktop -f,node -d} '{001,010,011,100}'
super + {_,shift + }{F5,F6,F7,F8}
bspc {desktop -f,node -d} '{α,β,γ,δ}'
super + {_,shift + }{1-7}
bspc {desktop -f,node -d} '^{1-7}'
super + {_,shift + }{F1,F2,F3,F4,F5,F6,F7}
bspc {desktop -f,node -d} '^{8,9,10,11,12,13,14}'

View File

@ -3,7 +3,15 @@
#
# focus or send to the given desktop
super + {_,shift + }{1-7}
bspc {desktop -f,node -d} '^{1-7}'
super + {_,shift + }{F1,F2,F3,F4,F5,F6,F7}
bspc {desktop -f,node -d} '^{8,9,10,11,12,13,14}'
super + {_,shift + }{F1,F2,F3,F4}
bspc {desktop -f,node -d} '^{1,2,3,4}'
super + {_,shift + }{1-9,0}
bspc {desktop -f,node -d} '^{8-16,17}'
super + {_,shift + }{F5,F6,F7,F8}
bspc {desktop -f,node -d} '^{18,19,20,21}'
super + {_,shift + }{F9,F10,F11,F12}
bspc {desktop -f,node -d} '^{25,26,27,28}'