Resolve conflicts from git rebase main

This commit is contained in:
Andrew Scott 2021-12-17 23:19:27 -05:00
parent c865f6d9da
commit 52cf9964ac
Signed by: a
GPG key ID: 3EB62D0BBB8DB381
3 changed files with 1 additions and 2 deletions

View file

@ -10,7 +10,6 @@ bspc config split_ratio 0.50
bspc config borderless_monocle true
bspc config gapless_monocle true
bspc rule -a Galculator state=floating
bspc rule -a vlc state=floating
bspc rule -a Blueman-manager state=floating

View file

@ -130,3 +130,4 @@ click-right =
;
;[settings]
;screenchange-reload = false

View file

@ -78,4 +78,3 @@ source ~/.bashrc
source ~/.bash_profile
source ~/.profile
xrdb ~/.Xresources