[gnome-shell/wip/snwh/sass-cleanup: 453/475] theme: remove font override

[Sam Hewitt <snwh src gnome org>]

commit 82a9aca6d762b36eb2fa158d27faa8a909e76ffd
Author: Sam Hewitt <sam snwh org>
Date:   Mon Dec 2 10:35:08 2019 -0500

    theme: remove font override

 data/theme/gnome-shell-sass/_common.scss | 3 +++
 1 file changed, 3 insertions(+)
---
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index 807ba964e3..30c352cdcc 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -60,7 +60,10 @@ $active_borders_color: darken($borders_color,if($variant=='light', 5%, 3%));
 
 // fonts
 $base_font_size: 11pt;
+<<<<<<< HEAD
 $text_shadow_color: if($variant == 'light', rgba(255,255,255,0.3), rgba(0,0,0,0.2));
+=======
+>>>>>>> 55efc6d1d... theme: remove font override
 
 // icons
 // $base_icon_size: 1.09em;