From da61c5b874791521a4078a15012df5a703946514 Mon Sep 17 00:00:00 2001
From: jeet041 <mahorjitendra@gmail.com>
Date: Fri, 9 May 2025 10:23:51 +0530
Subject: [PATCH] Update test_conflict.java

Signed-off-by: jeet041 <mahorjitendra@gmail.com>
---
 .../org/springframework/samples/petclinic/test_conflict.java | 5 +++--
 1 file changed, 3 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 f1a23885b..fd3ac702b 100644
--- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java
+++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java
@@ -5,6 +5,7 @@ public class HelloWorld {
 
     public static void helloWorld() {
         System.out.println("Hello, World! main");
-        System.out.println("Hello, World! main");
+        System.out.println("Hello, World! dev");
+		System.out.println("Hello, World! dev");
     }
-}
\ No newline at end of file
+}