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 17:22:45 +05:30
parent 99df760eac
commit dae1070aba
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,8 +5,8 @@ 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! dev.."); System.out.println("Hello, World! main");
System.out.println("Hello, World! dev...."); System.out.println("Hello, World! main.....");
System.out.println("Hello, World!dev ...."); System.out.println("Hello, World! main.......");
} }
} }