resolved conflicts

2016-07-07 21:49:14 +00:00
parent d8a8ad354f fff769ed9d
commit c9865a0dd4
4 changed files with 2 additions and 2 deletions
--- a/spring-boot/src/test/java/org/baeldung/boot/DemoApplicationTests.java
+++ b/spring-boot/src/test/java/org/baeldung/boot/DemoApplicationTests.java
@@ -14,5 +14,4 @@ public class DemoApplicationTests {
    @Test
    public void contextLoads() {
    }
-
 }