From b97343c59c0fca7cda4420284c035c4bf2416390 Mon Sep 17 00:00:00 2001
From: jeet041 <mahorjitendra@gmail.com>
Date: Tue, 22 Apr 2025 13:29:36 +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 02da51bfb..22a9f2b88 100644
--- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java
+++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java
@@ -6,5 +6,6 @@ public class HelloWorld {
     public static void helloWorld() {
         System.out.println("Hello, World!");
 		System.out.println("Hello, World! from main");
+		System.out.println("Hello, World! from main");
     }
 }