mirror of
https://github.com/spring-projects/spring-framework
synced 2026-06-08 17:33:33 +00:00
399453d9f1
# Conflicts: # spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java # spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java