From 80618c102abcb5f4bbd2e2e78e6cab9ab5d32ce2 Mon Sep 17 00:00:00 2001
From: jeet041 <mahorjitendra@gmail.com>
Date: Tue, 22 Apr 2025 13:30:00 +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 02da51bfb..dd97fd5d7 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!");
-		System.out.println("Hello, World! from main");
+		System.out.println("Hello, World! from dev");
+		System.out.println("Hello, World! from dev");
     }
 }