From 1aed130c70d3580782665e3db07e7d670076f97f Mon Sep 17 00:00:00 2001
From: Jitendra-Mahor_brillio <jitendra.mahor@brillio.com>
Date: Tue, 22 Apr 2025 16:46:47 +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    | 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 7bd8192d4..e34e3bbdd 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");
     }
 }
\ No newline at end of file