From 1114dfb1eddf764e0fd3cd0975fec0152aa124c8 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Thu, 30 Dec 2021 18:12:27 -0500 Subject: [PATCH] Fix rebase conflicts --- config/bspwm/bspwmrc | 1 - config/polybar/config.ini | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index 652a4c7..472a9a9 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -41,7 +41,6 @@ bspc rule -a teams-for-linux desktop='^9' bspc rule -a tutanota-desktop desktop='^10' bspc rule -a Thunderbird desktop='^10' - ### Focus on 1st workspace by default bspc desktop -f 1 diff --git a/config/polybar/config.ini b/config/polybar/config.ini index 5c13dec..f095acd 100644 --- a/config/polybar/config.ini +++ b/config/polybar/config.ini @@ -34,9 +34,15 @@ dim-value = 1.0 locale = en_US.UTF-8 font-0 = Hack:size=10;3 +<<<<<<< HEAD font-1 = Font Awesome 6 Free:style=Solid:size=12;3 font-2 = Font Awesome 6 Free:style=Regular:size=12;3 font-3 = Font Awesome 6 Brands:style=Regular:size=12;3 +======= +font-1 = Font Awesome 5 Free:style=Solid:size=12;3 +font-2 = Font Awesome 5 Free:style=Regular:size=12;3 +font-3 = Font Awesome 5 Brands:style=Regular:size=12;3 +>>>>>>> fd658c5 (Fix rebase conflicts) modules-left = workspaces sep title modules-center = spotify