From 7617d8ab37e626a34f0e4a7135623c3c951fe6e9 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 24 Apr 2025 11:52:09 +0530 Subject: [PATCH 1/2] Update test_conflict.java Signed-off-by: jeet041 --- .../springframework/samples/petclinic/test_conflict.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 981c47851..eba83d157 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -4,8 +4,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! main"); + System.out.println("Hello, World! dev"); + } -} \ No newline at end of file +} From 28c66c2b7e60c10cae3053446f06bd477c5de405 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 24 Apr 2025 12:24:15 +0530 Subject: [PATCH 2/2] Update test_conflict.java Signed-off-by: jeet041 --- .../org/springframework/samples/petclinic/test_conflict.java | 3 ++- 1 file changed, 2 insertions(+), 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 e34e3bbdd..41d7eed42 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! main"); + System.out.println("Hello, World! dev"); } -} \ No newline at end of file +}