# Conflicts: # spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java # spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java |
||
---|---|---|
.. | ||
src | ||
spring-jdbc.gradle |
# Conflicts: # spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java # spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java |
||
---|---|---|
.. | ||
src | ||
spring-jdbc.gradle |