Merge branch '1.1.x'

d5b7f49f · Andy Wilkinson · 2fb4d2ec · 9270303a · d5b7f49f
Commit d5b7f49f authored Nov 26, 2014 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

DataSourceInitializer.java ...mework/boot/autoconfigure/jdbc/DataSourceInitializer.java +1 -1

No files found.
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
@@ -35,7 +35,7 @@ import org.springframework.util.StringUtils;

 /**
 * Bean to handle {@link DataSource} initialization by running {@literal schema-*.sql} on
- * {@link PostConstruct} and and {@literal data-*.sql} SQL scripts on a
+ * {@link PostConstruct} and {@literal data-*.sql} SQL scripts on a
 * {@link DataSourceInitializedEvent}.
 *
 * @author Dave Syer