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

🔀 Merged via GitHub API

Browse source 
Update test_conflict.java
This commit is contained in:
jeet041 2025-05-09 16:35:21 +05:30 committed by GitHub
commit e050e9f3be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,8 @@ 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) {
public void notifyUser2(int userId) {
System.out.println("main: sending notification to user " + userId); System.out.println("main: sending notification to user " + 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! main"); System.out.println("Hello, World! dev");
} }
} }