Fix merge

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm

@@ -405,68 +405,6 @@ sub display {
             ( $req->data->{waitingMessage} ? ( WAITING_MESSAGE => 1 ) : () ),
         );
 
-<<<<<<< HEAD
-=======
-        # Display captcha if it's enabled
-        if ( $req->captcha ) {
-            %templateParams = (
-                %templateParams,
-                CAPTCHA_SRC  => $req->captcha,
-                CAPTCHA_SIZE => $self->{conf}->{captcha_size} || 6
-            );
-        }
-        if ( $req->token ) {
-            %templateParams = ( %templateParams, TOKEN => $req->token, );
-        }
-
-        # Show password form if password policy error
-        if (
-
-               $req->{error} == PE_PP_CHANGE_AFTER_RESET
-            or $req->{error} == PE_PP_MUST_SUPPLY_OLD_PASSWORD
-            or $req->{error} == PE_PP_INSUFFICIENT_PASSWORD_QUALITY
-            or $req->{error} == PE_PP_PASSWORD_TOO_SHORT
-            or $req->{error} == PE_PP_PASSWORD_TOO_YOUNG
-            or $req->{error} == PE_PP_PASSWORD_IN_HISTORY
-            or $req->{error} == PE_PASSWORD_MISMATCH
-            or $req->{error} == PE_BADOLDPASSWORD
-            or $req->{error} == PE_PASSWORDFORMEMPTY
-            or (    $req->{error} == PE_PP_PASSWORD_EXPIRED
-                and $self->conf->{ldapAllowResetExpiredPassword} )
-          )
-        {
-            %templateParams = (
-                %templateParams,
-                REQUIRE_OLDPASSWORD =>
-                  1,    # Old password is required to check user credentials
-                DISPLAY_FORM          => 0,
-                DISPLAY_OPENID_FORM   => 0,
-                DISPLAY_YUBIKEY_FORM  => 0,
-                DISPLAY_PASSWORD      => 1,
-                DISPLAY_RESETPASSWORD => 0,
-                AUTH_LOOP             => [],
-                CHOICE_PARAM          => $self->conf->{authChoiceParam},
-                CHOICE_VALUE          => $req->data->{_authChoice},
-                OLDPASSWORD           => $self->checkXSSAttack( 'oldpassword',
-                    $req->data->{oldpassword} ) ? ""
-                : $req->data->{oldpassword},
-                HIDE_OLDPASSWORD => $self->conf->{hideOldPassword},
-                PPOLICY_NOPOLICY => !$self->isPP(),
-                DISPLAY_PPOLICY  => $self->conf->{portalDisplayPasswordPolicy},
-                PPOLICY_MINSIZE  => $self->conf->{passwordPolicyMinSize},
-                PPOLICY_MINLOWER => $self->conf->{passwordPolicyMinLower},
-                PPOLICY_MINUPPER => $self->conf->{passwordPolicyMinUpper},
-                PPOLICY_MINDIGIT => $self->conf->{passwordPolicyMinDigit},
-                PPOLICY_MINSPECHAR => $self->conf->{passwordPolicyMinSpeChar},
-                (
-                    $self->conf->{passwordPolicyMinSpeChar} || $self->speChars()
-                    ? ( PPOLICY_ALLOWEDSPECHAR => $self->speChars() )
-                    : ()
-                ),
-            );
-        }
-
->>>>>>> v2.0
         # Disable all forms on:
         # * Logout message
         # * Account lock