# Conflicts: # app/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java # Conflicts: # app/core/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java
# Conflicts: # app/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java # Conflicts: # app/core/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java