mirror of
https://github.com/spring-projects/spring-petclinic.git
synced 2025-07-17 21:35:50 +00:00
Update test_conflict.java
Signed-off-by: jeet041 <mahorjitendra@gmail.com>
This commit is contained in:
parent
a5d677ad49
commit
c8953daddf
1 changed files with 2 additions and 4 deletions
|
@ -4,8 +4,6 @@ public class HelloWorld {
|
|||
}
|
||||
|
||||
public static void helloWorld() {
|
||||
System.out.println("Hello, World!");
|
||||
System.out.println("Hello, World! from dev");
|
||||
System.out.println("Hello, World! from main");
|
||||
System.out.println("Hello");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue