From d3a0e603fb2baa7aef9f1243739b243d0aaff657 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Sun, 8 Sep 2013 20:45:22 +0000 Subject: [PATCH] Bug 10320: (follow-up) remove stray merge conflict marker Signed-off-by: Galen Charlton --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 99a2d45992..0311bddac6 100644 --- 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; -- 2.39.5