Browse Source
# Conflicts: # spring-aop/src/main/java/org/springframework/aop/framework/CoroutinesUtils.java # spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java # spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java # spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceXmlParsingTests.javapull/35665/head
3 changed files with 4 additions and 1 deletions
Loading…
Reference in new issue