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 
Dev conflict
This commit is contained in:
jeet041 2025-04-24 01:33:48 +05:30 committed by GitHub
commit 561b191fb1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
public class UserService {
public String getUserName(int userId) {
return "Main: User_" + userId;
return "User_" + userId;
}
public boolean isUserActive(int userId) {

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

@ -4,8 +4,8 @@ public class 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! main");
System.out.println("Hello, World! main");
System.out.println("Hello, World! main");
}
}