!

kolorobot · Apr 20, 2012 · aad0c67 · aad0c67
1 parent 50d838b
commit aad0c67
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/main/webapp/WEB-INF/views/register.jsp b/src/main/webapp/WEB-INF/views/register.jsp
@@ -12,11 +12,7 @@
             <td>Password</td>
             <td><form:password path="password" /> <form:errors path="password" /></td>
         </tr>
-<<<<<<< HEAD
-        <!-- 
-=======
         <!--
->>>>>>> refs/remotes/choose_remote_name/master
         <tr>
             <td>Confirm password</td>
             <td><form:password path="confirmedPassword" /> <form:errors path="confirmedPassword" /></td>