Merge branch '1.1.x'

Conflicts: spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java
2014-09-04 09:41:58 -07:00
parent ad8be26efd eaa3bd040d
commit 9cc893cd35
2 changed files with 8 additions and 5 deletions
--- a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java
@@ -173,4 +173,5 @@ public class RelaxedPropertyResolverTests {
 		assertThat(subProperties.get("a.c"), equalTo((Object) "2"));
 		assertThat(subProperties.get("a.d"), equalTo((Object) "3"));
 	}
+
 }