From a22253921a1b9d3b59316d983e5c714b7f73f040 Mon Sep 17 00:00:00 2001
From: jeet041 <mahorjitendra@gmail.com>
Date: Wed, 23 Apr 2025 10:53:24 +0530
Subject: [PATCH] Update test_conflict.java

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