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

🤖 Applied provided resolved content to 1 merge conflicts

Browse source
This commit is contained in:
Jitendra-Mahor_brillio 2025-05-09 10:21:10 +05:30
commit 9be2e28631
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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