Merge branch '1.1.x'

2014-09-23 09:42:29 +01:00 · 2014-09-23 09:42:29 +01:00 · 42821990f4
parent 97dcd24668 38d8a5cda0
commit 42821990f4
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
@ -124,7 +124,7 @@ public class WebMvcAutoConfiguration {
 		return new HiddenHttpMethodFilter();
 	}

-	// Defined as a nested config to ensure WebMvcConfigurerAdapter it not read when not
+	// Defined as a nested config to ensure WebMvcConfigurerAdapter is not read when not
 	// on the classpath
 	@Configuration
 	@EnableWebMvc