From 315894cc3022d7bb6b5f817046fe4bf3a3c7ddef Mon Sep 17 00:00:00 2001
From: "Stephen V. Williams" <svwilliams@gmail.com>
Date: Mon, 17 Jun 2013 10:44:49 -0500
Subject: [PATCH] Update pagedResults - cleaned up bad merge results

---
 .../templates/freemarker/body/search/search-pagedResults.ftl | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl
index c7d84eebe..a0946ed23 100644
--- a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl
+++ b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl
@@ -23,16 +23,11 @@
 	var urlsBase = '${urls.base}';
 </script>
 </h2>
-<<<<<<< HEAD
 
 <span id="downloadResults" title="Download Results">
 	<img id="downloadIcon" src="images/download-icon.png" alt="Download Results"  />
 </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>
 <div class="contentsBrowseGroup">