Continued:

[jjobs-war.git] / web / guest / user / login.xhtml

diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
index 8c7aa57dc9ba49f88df158c0cb587c73e100cde5..86d56b7ce06963cb0a7411e597d85278f894ef5f 100644 (file)
--- a/web/guest/user/login.xhtml
+++ b/web/guest/user/login.xhtml
@@ -16,20 +16,6 @@
                </ui:define>
 
                <ui:define name="content">
-<<<<<<< HEAD
-                       <div class="para">
-                               <!-- TODO Internatialize this somehow //-->
-                               Noch kein Benutzerkonto? Einfach <h:link id="user_register" outcome="user_register" title="Als Benutzer anmelden">hier</h:link> anmelden.
-                       </div>
-
-                       <div class="para">
-                               <ui:include src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
-                       </div>
-
-                       <div class="para">
-                               <h:link id="user_lost_password" outcome="user_lost_passwd" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
-                       </div>
-=======
                        <ui:fragment rendered="#{userController.isUserNameRequired()}">
                                <div class="para">
                                        <!-- TODO Internatialize this somehow //-->
@@ -48,7 +34,6 @@
                        <ui:fragment rendered="#{not userController.isUserNameRequired()}">
                                <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" />
                        </ui:fragment>
->>>>>>> 4a789c7... Rewritten a lot:
                </ui:define>
        </ui:composition>
 </html>