From 8863c61fe258ad4dcfd66f8f36764ce5aaaac3ec Mon Sep 17 00:00:00 2001 From: jeet041 Date: Tue, 22 Apr 2025 15:19:20 +0530 Subject: [PATCH] Update test_conflict.java Signed-off-by: jeet041 --- .../samples/petclinic/test_conflict.java | 15 +++++++++++---- 1 file changed, 11 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 7f19d7419..dd97fd5d7 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -1,4 +1,11 @@ -{ -"code": "public class HelloWorld {\n public static void main(String[] args) {\n helloWorld();\n }\n\n public static void helloWorld() {\n System.out.println(\"Hello, World!\");\n System.out.println(\"Hello, World! from dev\");\n System.out.println(\"Hello, World! from main\");\n }\n}", -"confidence Score": 85 -} \ No newline at end of file +public class HelloWorld { + public static void main(String[] args) { + helloWorld(); + } + + public static void helloWorld() { + System.out.println("Hello, World!"); + System.out.println("Hello, World! from dev"); + System.out.println("Hello, World! from dev"); + } +}