From 1de775ba7e4c444546ab6d678ffbea59c6653d4d Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Sun, 15 Jan 2023 10:51:41 -0500 Subject: [PATCH] removing errant conflict artifact --- Open-ILS/src/templates/opac/css/style.css.tt2 | 1 - 1 file changed, 1 deletion(-) diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2 index 66d9ea92cf..720c080873 100644 --- a/Open-ILS/src/templates/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates/opac/css/style.css.tt2 @@ -1764,7 +1764,6 @@ div#facet_sidebar { background-image: -o-linear-gradient([% css_colors.primary %], [% css_colors.primary_fade %]); background-image: -webkit-linear-gradient([% css_colors.primary %], [% css_colors.primary_fade %]); background-image: linear-gradient([% css_colors.primary %], [% css_colors.primary_fade %]); ->>>>>>> 6f2b897166... PINES logo and color scheme changes } #footer { -- 2.11.0