From dae1070aba23b00baac5c4cd38a64fa625538618 Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 17:22:45 +0530 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20conflict?= =?UTF-8?q?s=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springframework/samples/petclinic/test_conflict.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 514646af9..78d408120 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -5,8 +5,8 @@ public class HelloWorld { public static void helloWorld() { System.out.println("Hello, World!"); - System.out.println("Hello, World! dev.."); - System.out.println("Hello, World! dev...."); - System.out.println("Hello, World!dev ...."); + System.out.println("Hello, World! main"); + System.out.println("Hello, World! main....."); + System.out.println("Hello, World! main......."); } -} +} \ No newline at end of file