From 1be0fef832ae816f42b79e01b237f144b315faad Mon Sep 17 00:00:00 2001 From: jeet041 Date: Tue, 22 Apr 2025 20:18:02 +0530 Subject: [PATCH 1/2] Update test_conflict.java Signed-off-by: jeet041 --- .../org/springframework/samples/petclinic/test_conflict.java | 1 - 1 file changed, 1 deletion(-) 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 bfe8da3b2..09e76dced 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -4,7 +4,6 @@ public class HelloWorld { } public static void helloWorld() { - System.out.println("Hello, World!"); System.out.println("Hello, World! main"); } } From ea9a74be2f3cf66a2996fcb4c99413268d514baf Mon Sep 17 00:00:00 2001 From: jeet041 Date: Wed, 23 Apr 2025 10:52:38 +0530 Subject: [PATCH 2/2] Update test_conflict.java Signed-off-by: jeet041 --- .../org/springframework/samples/petclinic/test_conflict.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 09e76dced..7d200ab55 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,6 @@ public class HelloWorld { } public static void helloWorld() { - System.out.println("Hello, World! main"); + System.out.println("Hello, World!"); } }