# Conflicts: # spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java |
||
|---|---|---|
| .. | ||
| main | ||
| test | ||
# Conflicts: # spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java |
||
|---|---|---|
| .. | ||
| main | ||
| test | ||