Resolve conflicts from git rebase main

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

config/polybar/config.ini

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

install.sh

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