DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-17 21:15:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

🤖 Applied provided resolved content to 2 merge conflicts

Browse source
This commit is contained in:
Yasaswini-3004 2025-05-09 11:05:17 +00:00
commit 4bd8142776
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/org/springframework/samples/petclinic/UserService.java
View file

@ -15,8 +15,9 @@ public class UserService {
public void notifyUser(int userId) { public void notifyUser(int userId) {
System.out.println("Main: sending notification to user " + 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 notifyUser2(int userId) {
System.out.println("main: sending notification to user " + userId);
} }
public void deleteUser(int userId) { public void deleteUser(int userId) {
@ -26,4 +27,4 @@ public class UserService {
private void logDeletion(int userId) { private void logDeletion(int userId) {
System.out.println("Main: user " + userId + " deleted"); System.out.println("Main: user " + userId + " deleted");
} }
} }

4
src/main/java/org/springframework/samples/petclinic/test_conflict.java
View file

@ -5,6 +5,6 @@ public class HelloWorld {
public static void helloWorld() { public static void helloWorld() {
System.out.println("Hello, World! main"); System.out.println("Hello, World! main");
System.out.println("Hello, World! dev"); System.out.println("Hello, World! dev");
} }
} }