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

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-09-08 20:45:22 +00:00 · 2013-09-08 20:45:22 +00:00 · d3a0e603fb
parent c26ab35be6
commit d3a0e603fb
1 changed files with 1 additions and 1 deletions
--- 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;