From 52cf9964ac2f789ec28de0ee87640aa7602c83d5 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Fri, 17 Dec 2021 23:19:27 -0500 Subject: [PATCH] Resolve conflicts from git rebase main --- config/bspwm/bspwmrc | 1 - config/polybar/config.ini | 1 + install.sh | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index 729ec32..c749174 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -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 diff --git a/config/polybar/config.ini b/config/polybar/config.ini index fc0bfa1..3890266 100644 --- a/config/polybar/config.ini +++ b/config/polybar/config.ini @@ -130,3 +130,4 @@ click-right = ; ;[settings] ;screenchange-reload = false + diff --git a/install.sh b/install.sh index 149b303..47ca93e 100755 --- a/install.sh +++ b/install.sh @@ -78,4 +78,3 @@ source ~/.bashrc source ~/.bash_profile source ~/.profile xrdb ~/.Xresources -