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
28a1973b5f
commit
a22253921a
1 changed files with 2 additions and 2 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