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 5b27dfbd7..02da51bfb 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -5,5 +5,6 @@ public class HelloWorld { public static void helloWorld() { System.out.println("Hello, World!"); + System.out.println("Hello, World! from main"); } }