resolved conflicts

spring-boot/src/test/java/org/baeldung/boot/DemoApplicationTests.java

@@ -14,5 +14,4 @@ public class DemoApplicationTests {
     @Test
     public void contextLoads() {
     }
-
 }

spring-boot/src/test/java/org/baeldung/boot/repository/FooRepositoryTest.java

@@ -30,4 +30,5 @@ public class FooRepositoryTest extends DemoApplicationTests {
         assertThat(foo, notNullValue());
         assertThat(foo.getId(), is(2));
     }
+
 }