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
4aded40aec
commit
2c418a74d5
1 changed files with 2 additions and 3 deletions
|
@ -4,7 +4,6 @@ public class HelloWorld {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void helloWorld() {
|
public static void helloWorld() {
|
||||||
System.out.println("Hello, World! main");
|
System.out.println("Hello, World! dev");
|
||||||
System.out.println("Hello, World! main");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue