From 41785faf66e924af8b4c4088cf63a9a7ed37c2d9 Mon Sep 17 00:00:00 2001
From: jeet041 <mahorjitendra@gmail.com>
Date: Fri, 2 May 2025 16:27:30 +0530
Subject: [PATCH] Update test_conflict.java

Signed-off-by: jeet041 <mahorjitendra@gmail.com>
---
 .../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 e34e3bbdd..f35f48c0e 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! main");
+		System.out.println("Hello, World! dev");
     }
-}
\ No newline at end of file
+}