From 7c88063cf07543ebd585e1f3139d88762d7387b7 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Fri, 9 May 2025 10:34:59 +0530 Subject: [PATCH 1/2] Update test_conflict.java Signed-off-by: jeet041 --- .../org/springframework/samples/petclinic/test_conflict.java | 3 ++- 1 file changed, 2 insertions(+), 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 e34e3bbdd..f35f48c0e 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! main"); + System.out.println("Hello, World! dev"); } -} \ No newline at end of file +} From a51060eb8730667868765d2efa89540dd9c94727 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Fri, 9 May 2025 13:04:18 +0530 Subject: [PATCH 2/2] Update UserService.java Signed-off-by: jeet041 --- .../org/springframework/samples/petclinic/UserService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java index 1b1fcac5a..f03326e40 100644 --- a/src/main/java/org/springframework/samples/petclinic/UserService.java +++ b/src/main/java/org/springframework/samples/petclinic/UserService.java @@ -15,6 +15,9 @@ public class UserService { public void notifyUser(int userId) { System.out.println("Main: sending notification to user " + userId); } + public void notifyUser2(int userId) { + System.out.println("dev: sending notification to user " + userId); + } public void deleteUser(int userId) { logDeletion(userId); @@ -23,4 +26,4 @@ public class UserService { private void logDeletion(int userId) { System.out.println("Main: user " + userId + " deleted"); } -} \ No newline at end of file +}