Polish

ed03ac19 · Andy Wilkinson · c2b85c1a · ed03ac19
Commit ed03ac19 authored Feb 16, 2021 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

FlywayAutoConfiguration.java ...rk/boot/autoconfigure/flyway/FlywayAutoConfiguration.java +1 -4

No files found.
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
@@ -54,11 +54,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.autoconfigure.jdbc.JdbcOperationsDependsOnPostProcessor;
 import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.NamedParameterJdbcOperationsDependsOnPostProcessor;
-<<<<<<< HEAD
-import org.springframework.boot.autoconfigure.orm.jpa.EntityManagerFactoryDependsOnPostProcessor;
-=======
 import org.springframework.boot.autoconfigure.jooq.DslContextDependsOnPostProcessor;
->>>>>>> 2.4.x
+import org.springframework.boot.autoconfigure.orm.jpa.EntityManagerFactoryDependsOnPostProcessor;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;