From 70d8403f2a839deedeb3aa0c1195b68c142de9cb Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 15:17:14 +0530 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20conflict?= =?UTF-8?q?s=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../samples/petclinic/test_conflict.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 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 dd97fd5d7..7f19d7419 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -1,11 +1,4 @@ -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"); - } -} +{ +"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