From b97343c59c0fca7cda4420284c035c4bf2416390 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Tue, 22 Apr 2025 13:29:36 +0530 Subject: [PATCH 1/5] Update test_conflict.java Signed-off-by: jeet041 --- .../org/springframework/samples/petclinic/test_conflict.java | 1 + 1 file changed, 1 insertion(+) 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 02da51bfb..22a9f2b88 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -6,5 +6,6 @@ public class HelloWorld { public static void helloWorld() { System.out.println("Hello, World!"); System.out.println("Hello, World! from main"); + System.out.println("Hello, World! from main"); } } From a30d8a1bd43b646ef123668a66acc30d05907982 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Tue, 22 Apr 2025 16:09:25 +0530 Subject: [PATCH 2/5] Update test_conflict.java Signed-off-by: jeet041 --- .../org/springframework/samples/petclinic/test_conflict.java | 2 -- 1 file changed, 2 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 22a9f2b88..5b27dfbd7 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -5,7 +5,5 @@ public class HelloWorld { public static void helloWorld() { System.out.println("Hello, World!"); - System.out.println("Hello, World! from main"); - System.out.println("Hello, World! from main"); } } From acda0f467a49b501752508a556ebd9728850056f Mon Sep 17 00:00:00 2001 From: jeet041 Date: Tue, 22 Apr 2025 16:42:28 +0530 Subject: [PATCH 3/5] 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 5b27dfbd7..62300c720 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!"); + System.out.println("Hello, World! main"); } } From 576f73451d511ae6a6ec2eccb30ef6ec4bb7b7c6 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Tue, 22 Apr 2025 17:11:53 +0530 Subject: [PATCH 4/5] 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 62300c720..5b27dfbd7 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!"); } } From e92c3ad6d39820712e09b645dd65b4484ff85958 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Tue, 22 Apr 2025 17:19:05 +0530 Subject: [PATCH 5/5] Update test_conflict.java Signed-off-by: jeet041 --- .../org/springframework/samples/petclinic/test_conflict.java | 3 +++ 1 file changed, 3 insertions(+) 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..6f030fce2 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,8 @@ public class HelloWorld { public static void helloWorld() { System.out.println("Hello, World!"); + System.out.println("Hello, World! main"); + System.out.println("Hello, World! main....."); + System.out.println("Hello, World! main......."); } }