mirror of
https://github.com/spring-projects/spring-petclinic.git
synced 2025-07-17 13:05:49 +00:00
🔀 Merged via GitHub API
Update test_conflict.java
This commit is contained in:
commit
c1c2e08c6f
1 changed files with 0 additions and 1 deletions
|
@ -5,6 +5,5 @@ 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");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue