From 8148e187d15d3881cd9e049feb28c2fd58720cf6 Mon Sep 17 00:00:00 2001
From: jeet041 <mahorjitendra@gmail.com>
Date: Mon, 28 Apr 2025 16:51:06 +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 62300c720..5d948e0b9 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,7 @@ public class HelloWorld {
     }
 
     public static void helloWorld() {
-        System.out.println("Hello, World! main");
+        System.out.println("Hello, World! dev");
+		 System.out.println("Hello, World! dev");
     }
 }