Patrick.Sy/spring-petclinic
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-18 22:05: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:
Jitendra-Mahor_brillio 2025-04-22 15:20:50 +05:30
parent 8863c61fe2
commit a5d677ad49
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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