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

🔀 Merged via GitHub API

Browse source 
Dev conflict
This commit is contained in:
jeet041 2025-05-02 17:30:05 +05:30 committed by GitHub
commit 23ec1e37d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,6 @@ public class HelloWorld {
public static void helloWorld() { public static void helloWorld() {
System.out.println("Hello, World! main"); System.out.println("Hello, World! main");
System.out.println("Hello, World! dev");
} }
} }