mirror of
https://github.com/spring-projects/spring-security.git
synced 2026-04-16 22:10:27 +00:00
Fix merge conflict
This commit is contained in:
parent
5b8d81828a
commit
aa35db5aad
@ -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;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user