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