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