DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-17 21:15: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:
Yasaswini-3004 2025-05-02 13:39:47 +00:00
commit 4aded40aec
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

@ -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");
}
}
}