From 28a1973b5fc84fee1e5bcd587d48c2bd1ed1c30f Mon Sep 17 00:00:00 2001
From: AI Resolver <ai-bot@example.com>
Date: Wed, 23 Apr 2025 10:51:26 +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

---
 .../org/springframework/samples/petclinic/test_conflict.java  | 4 +---
 1 file changed, 1 insertion(+), 3 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 6f853bb6e..e34e3bbdd 100644
--- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java
+++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java
@@ -6,6 +6,4 @@ public class HelloWorld {
     public static void helloWorld() {
         System.out.println("Hello, World! main");
     }
-}
-
-// Confidence Score: 100%
\ No newline at end of file
+}
\ No newline at end of file