root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

This commit is contained in:
Phillip Webb 2014-10-06 11:07:28 -07:00
parent 872f30e5d0 b616e9fdc4
commit 09d5812c3b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-samples/spring-boot-sample-parent-context/src/test/java/sample/parent/consumer/SampleIntegrationApplicationTests.java → spring-boot-samples/spring-boot-sample-parent-context/src/test/java/sample/parent/consumer/SampleIntegrationParentApplicationTests.java
View File

@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue;
*
* @author Dave Syer
*/
public class SampleIntegrationApplicationTests {
public class SampleIntegrationParentApplicationTests {
private static ConfigurableApplicationContext context;