diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index 62300c720..e34e3bbdd 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -6,4 +6,4 @@ public class HelloWorld { public static void helloWorld() { System.out.println("Hello, World! main"); } -} +} \ No newline at end of file