Bug 10320: (follow-up) remove stray merge conflict marker

Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 99a2d45..0311bdd 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -3029,7 +3029,7 @@ padding: 0.1em 0;
 .thumbnail-shelfbrowser span {
     margin: 0px auto;
 }
-<<<<<<< HEAD
+
 .sorting_asc {
     padding-right: 19px;
     background: url("../../images/asc.gif") no-repeat scroll right center #EEEEEE;