Patrick.Sy/spring-petclinic
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-19 06:15:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Auto-merged using Claude

Browse source
This commit is contained in:
Jitendra-Mahor_brillio 2025-04-23 16:01:04 +05:30
commit 76ff9273ca
1 changed files with 4 additions and 4 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,8 +4,8 @@ public class HelloWorld {
} }
public static void helloWorld() { public static void helloWorld() {
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! main");
} }
} }