DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-18 13:35:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into dev-conflict

Browse source 
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
This commit is contained in:
jeet041 2025-04-22 17:52:15 +05:30 committed by GitHub
commit 9452907edd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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