From 5da2018a4ad1f5b95b0f40323e8f05bf19b19608 Mon Sep 17 00:00:00 2001
From: jeet041 <mahorjitendra@gmail.com>
Date: Sun, 11 May 2025 18:33:36 +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, 1 insertion(+), 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 139155f7c..62300c720 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,5 @@ 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
+}