mirror of
https://codeberg.org/andyscott/dotfiles.git
synced 2024-12-22 18:03:11 -05:00
Resolve conflicts from git rebase main
This commit is contained in:
parent
c865f6d9da
commit
52cf9964ac
3 changed files with 1 additions and 2 deletions
|
@ -10,7 +10,6 @@ bspc config split_ratio 0.50
|
||||||
bspc config borderless_monocle true
|
bspc config borderless_monocle true
|
||||||
bspc config gapless_monocle true
|
bspc config gapless_monocle true
|
||||||
|
|
||||||
|
|
||||||
bspc rule -a Galculator state=floating
|
bspc rule -a Galculator state=floating
|
||||||
bspc rule -a vlc state=floating
|
bspc rule -a vlc state=floating
|
||||||
bspc rule -a Blueman-manager state=floating
|
bspc rule -a Blueman-manager state=floating
|
||||||
|
|
|
@ -130,3 +130,4 @@ click-right =
|
||||||
;
|
;
|
||||||
;[settings]
|
;[settings]
|
||||||
;screenchange-reload = false
|
;screenchange-reload = false
|
||||||
|
|
||||||
|
|
|
@ -78,4 +78,3 @@ source ~/.bashrc
|
||||||
source ~/.bash_profile
|
source ~/.bash_profile
|
||||||
source ~/.profile
|
source ~/.profile
|
||||||
xrdb ~/.Xresources
|
xrdb ~/.Xresources
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue