Merged branch develop_1 with master
This commit is contained in:
commit
da74eeba16
@ -9,6 +9,7 @@ public class DemoApplication {
|
|||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
System.out.println("Start application");
|
System.out.println("Start application");
|
||||||
System.out.println("Develop_2 here");
|
System.out.println("Develop_2 here");
|
||||||
|
System.out.println("Second println")
|
||||||
SpringApplication.run(DemoApplication.class, args);
|
SpringApplication.run(DemoApplication.class, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
4
src/main/java/controller/UserController.java
Normal file
4
src/main/java/controller/UserController.java
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
package controller;
|
||||||
|
|
||||||
|
public class UserController {
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user