From f3cebc95702a55594092cb4bb1545b9a571ee470 Mon Sep 17 00:00:00 2001
From: jeet041 <mahorjitendra@gmail.com>
Date: Tue, 22 Apr 2025 12:22:07 +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 insertion(+)

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 5b27dfbd7..02da51bfb 100644
--- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java
+++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java
@@ -5,5 +5,6 @@ public class HelloWorld {
 
     public static void helloWorld() {
         System.out.println("Hello, World!");
+		System.out.println("Hello, World! from main");
     }
 }