Conflict resolved
This commit is contained in:
commit
7003669dde
@ -10,6 +10,8 @@ public class DemoApplication {
|
|||||||
System.out.println("Start application");
|
System.out.println("Start application");
|
||||||
System.out.println("My application");
|
System.out.println("My application");
|
||||||
System.out.println("TEST1");
|
System.out.println("TEST1");
|
||||||
|
System.out.println("You're up");
|
||||||
|
System.out.println("test2");
|
||||||
SpringApplication.run(DemoApplication.class, args);
|
SpringApplication.run(DemoApplication.class, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user