From 2c418a74d50549b5bfadd799bedbb0d30a2fa8b5 Mon Sep 17 00:00:00 2001
From: jeet041 <mahorjitendra@gmail.com>
Date: Tue, 6 May 2025 21:32:55 +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, 2 insertions(+), 3 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..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,7 +4,6 @@ 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");
     }
-}
\ No newline at end of file
+}