From: Chris Burton Date: Fri, 11 Sep 2020 23:00:32 +0000 (-0400) Subject: LP1778972 Fixing a couple issues in merge X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=3d01aab5c4ce2f15bec6460d6aba3a599fbe987d;p=Evergreen.git LP1778972 Fixing a couple issues in merge Signed-off-by: Jane Sandberg --- diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/homesearch.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/homesearch.tt2 index e79cfb3c56..229d4429d6 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/homesearch.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/homesearch.tt2 @@ -1,6 +1,5 @@ - -[%- - PROCESS "opac/parts/css/colors.tt2"; -%] + [% PROCESS carousels %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 index b9eae7d14a..79bb578a56 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 @@ -125,7 +125,7 @@ END; [%- END %] - + [% IF ctx.bookbag %]