From cf09bdf276ff05ea0748cffe49943bd82af08f70 Mon Sep 17 00:00:00 2001 From: Ike Kottlowski Date: Tue, 3 Feb 2026 11:03:26 -0500 Subject: [PATCH] fix: merge conflict error --- .../SendAccess/SendEmailOtpRequestValidator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Identity/IdentityServer/RequestValidators/SendAccess/SendEmailOtpRequestValidator.cs b/src/Identity/IdentityServer/RequestValidators/SendAccess/SendEmailOtpRequestValidator.cs index 1aa9eb6ffa..8bbeeba2c0 100644 --- a/src/Identity/IdentityServer/RequestValidators/SendAccess/SendEmailOtpRequestValidator.cs +++ b/src/Identity/IdentityServer/RequestValidators/SendAccess/SendEmailOtpRequestValidator.cs @@ -76,7 +76,7 @@ public class SendEmailOtpRequestValidator( token, string.Format(SendAccessConstants.OtpEmail.Subject, token)); - return BuildErrorResult(SendAccessConstants.EmailOtpValidatorResults.EmailOtpSent); + return BuildErrorResult(SendAccessConstants.EmailOtpValidatorResults.EmailAndOtpRequired); } // validate request otp