From d0f92e6becc2a1cfaf34db949ae0bb21418d0dcd Mon Sep 17 00:00:00 2001
From: AI Resolver <ai-bot@example.com>
Date: Wed, 23 Apr 2025 10:55:10 +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, 2 insertions(+), 2 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 bd9c8c9d3..7bd8192d4 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! dev");
+        System.out.println("Hello, World!");
     }
-}
+}
\ No newline at end of file