From a2f4bd0dc7d40c844e1fcfd48a9d0ada0a6cb9f6 Mon Sep 17 00:00:00 2001
From: jeet041 <mahorjitendra@gmail.com>
Date: Thu, 12 Jun 2025 15:33:23 +0530
Subject: [PATCH] Update test_conflict.java

Signed-off-by: jeet041 <mahorjitendra@gmail.com>
---
 .../org/springframework/samples/petclinic/test_conflict.java     | 1 -
 1 file changed, 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 f35f48c0e..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");
     }
 }