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

🤖 Auto-resolved merge conflicts with Claude AI

Browse source
This commit is contained in:
AI Resolver 2025-04-22 20:53:16 +05:30 committed by Jitendra-Mahor_brillio
parent 9260c299fe
commit a848644aa3
1 changed files with 2 additions and 2 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,6 +4,6 @@ public class HelloWorld {
}
public static void helloWorld() {
System.out.println("Hello, World! dev");
System.out.println("Hello, World! main");
}
}
}