litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update pagedResults - cleaned up bad merge results

Browse source
This commit is contained in:
Stephen V. Williams 2013-06-17 10:44:49 -05:00
parent 16412889b2
commit 315894cc30
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
webapp/web/templates/freemarker/body/search/search-pagedResults.ftl
View file

@ -23,16 +23,11 @@
var urlsBase = '${urls.base}'; var urlsBase = '${urls.base}';
</script> </script>
</h2> </h2>
<<<<<<< HEAD
<span id="downloadResults" title="Download Results"> <span id="downloadResults" title="Download Results">
<img id="downloadIcon" src="images/download-icon.png" alt="Download Results" /> <img id="downloadIcon" src="images/download-icon.png" alt="Download Results" />
</span> </span>
<span id="searchHelp"><a href="${urls.base}/searchHelp" title="search help">Not the results you expected?</a></span>
<div class="contentsBrowseGroup" style="clear:left">
<span id="searchHelp"><a href="${urls.base}/searchHelp" title="${i18n().search_help}">${i18n().not_expected_results}</a></span> <span id="searchHelp"><a href="${urls.base}/searchHelp" title="${i18n().search_help}">${i18n().not_expected_results}</a></span>
<div class="contentsBrowseGroup"> <div class="contentsBrowseGroup">