From 03bcf69bece4866abbe1d30224a7660989f22892 Mon Sep 17 00:00:00 2001
From: Jitendra-Mahor_brillio <jitendra.mahor@brillio.com>
Date: Tue, 22 Apr 2025 17:36:01 +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   | 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 5b27dfbd7..bf6064ed0 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!");
+        System.out.println("Hello, World! main");
     }
-}
+}
\ No newline at end of file