Fix merge conflict

This commit is contained in:
Joe Grandja 2026-04-02 05:45:17 -04:00
parent 5b8d81828a
commit aa35db5aad

View File

@ -18,7 +18,8 @@ package org.springframework.security.oauth2.server.authorization.authentication;
import java.io.Serial;
import org.springframework.lang.Nullable;
import org.jspecify.annotations.Nullable;
import org.springframework.security.core.Authentication;
import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
import org.springframework.security.oauth2.core.OAuth2Error;