diff --git a/core/src/main/java/org/springframework/security/authorization/method/Jsr250AuthorizationManager.java b/core/src/main/java/org/springframework/security/authorization/method/Jsr250AuthorizationManager.java index 7b787446fe..e6febe1492 100644 --- a/core/src/main/java/org/springframework/security/authorization/method/Jsr250AuthorizationManager.java +++ b/core/src/main/java/org/springframework/security/authorization/method/Jsr250AuthorizationManager.java @@ -67,7 +67,7 @@ public final class Jsr250AuthorizationManager implements AuthorizationManager> authoritiesAuthorizationManager) { diff --git a/git/hooks/.forward-merge.swp b/git/hooks/.forward-merge.swp new file mode 100644 index 0000000000..9fb46808e5 Binary files /dev/null and b/git/hooks/.forward-merge.swp differ