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:
Jitendra-Mahor_brillio 2025-04-22 15:17:14 +05:30
parent 80618c102a
commit 70d8403f2a
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,4 @@
public class HelloWorld {
public static void main(String[] args) {
helloWorld();
}
public static void helloWorld() {
System.out.println("Hello, World!");
System.out.println("Hello, World! from dev");
System.out.println("Hello, World! from dev");
}
}
{
"code": "public class HelloWorld {\n public static void main(String[] args) {\n helloWorld();\n }\n\n public static void helloWorld() {\n System.out.println(\"Hello, World!\");\n System.out.println(\"Hello, World! from dev\");\n System.out.println(\"Hello, World! from main\");\n }\n}",
"confidence Score": 85
}