mirror of
https://github.com/spring-projects/spring-petclinic.git
synced 2025-07-16 04:45:49 +00:00
🔀 Merged via GitHub API
Update test_conflict.java
This commit is contained in:
commit
d6ffa74f0d
1 changed files with 1 additions and 1 deletions
|
@ -4,6 +4,6 @@ public class HelloWorld {
|
|||
}
|
||||
|
||||
public static void helloWorld() {
|
||||
System.out.println("Hello, World! main");
|
||||
System.out.println("Hello, World! dev");
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue