From: Chris Sharp <csharp@georgialibraries.org>
Date: Sun, 15 Jan 2023 15:51:41 +0000 (-0500)
Subject: removing errant conflict artifact
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1de775ba7e4c444546ab6d678ffbea59c6653d4d;p=evergreen%2Fpines.git

removing errant conflict artifact
---

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 {