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 66d9ea9..720c080 100644 (file)
--- 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 {