Resolve conflicts from git rebase main

This commit is contained in:
Andrew Scott 2021-12-17 23:19:27 -05:00
parent 38405fd69f
commit d603f310a4
Signed by: a
GPG key ID: 3EB62D0BBB8DB381

View file

@ -100,7 +100,6 @@ click-right =
;font-2 = Font Awesome 6 Free:style=Regular: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-3 = Font Awesome 6 Brands:style=Regular:size=12;3
;
;modules-left = workspaces sep title ;modules-left = workspaces sep title
;modules-center = spotify ;modules-center = spotify
;modules-right = cpu sep memory sep filesystem ;modules-right = cpu sep memory sep filesystem