Correcting git-conflict-induced typo in form.tt2

diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2
index 0e988a3..6b9ed97 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/form.tt2
@@ -16,7 +16,6 @@
 <div id='login-form-box' class='login_boxes left_brain' style='float:left'>
     <h1>[% l('Log in to Your Account') %]</h1>
     [% l('Please enter the following information:') %]
-<<<<<<< HEAD
     <form method='post'>
         <div style="float: left; padding-bottom: 10px; margin-right: 40px;">
             <label for='username_field' class="lbl1" >[% l('Library Card Number or Username') %]</label>