mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-09-18 00:49:02 +00:00
# Conflicts: # spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java # spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java