# Conflicts: # spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java # spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java
# Conflicts: # spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java # spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java