From 29a870ecb245f982f646aebd9af6250e307a61cf 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/polybar/config.ini | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/polybar/config.ini b/config/polybar/config.ini index aad6c2c..a877017 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 +>>>>>>> 26b8507 (Fix rebase conflicts) modules-left = workspaces sep title modules-center = spotify