Missed some git merge HEAD tags.

diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
index a3bd339..307fdf0 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
@@ -107,8 +107,6 @@
                         value=default_sort class='results_header_sel';
                     %]
 
-<<<<<<< HEAD
-<<<<<<< HEAD
                     [% IF NOT metarecords.disabled %]
                         <br/><!-- <br> may seem redundant, but it allows the
                             <input> (below) to drop down inline w/ its label -->
@@ -121,11 +119,6 @@
                                 [% l("Group Formats and Editions") %]</label>
                         </div>
                     [% END %]
-=======
->>>>>>> 099a674... OPAC advanced search page UI tweaks. (Terran)
-
-=======
->>>>>>> 03ad13e... OPAC Updates related to page text and translations. Also required are the
                 [% CASE "copy_location" %]
                     <select id="adv_copy_location_selector"
                         title="[% l('Select Shelving Location') %]"

diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2
index cba2b7d..cd04706 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/form.tt2
@@ -56,15 +56,9 @@
             END;
                 redirect = redirect  | replace('^http:', 'https:');
             %]
-<<<<<<< HEAD
             <input type='hidden' name='redirect_to' value='[% redirect | html %]'/>
             <input type="checkbox" name="persist" id="login_persist" /><label for="login_persist"> [% l('Stay logged in?') %]</label>
             <input type="submit" value="[% l('Log in') %]" alt="[% l('Log in') %]" class="opac-button" />
-=======
-            <input type='hidden' name='redirect_to' value='[% redirect %]'/>
-            <input type="checkbox" name="persist" id="login_persist"/><label for="login_persist" style="font-weight:bold;"> [% l('Stay logged in?') %]</label>
-            <input type="submit" value="[% l('Log in') %]" alt="[% l('Log in') %]" class="opac-button" style="padding:10px 30px 10px 30px;" />
->>>>>>> 03ad13e... OPAC Updates related to page text and translations. Also required are the
         </div>
         <input id="client_tz_id" name="client_tz" type="hidden" />
     </form>