forked from MKoziel/DemoApplication
Merge branch 'develop_3'
# Conflicts: # src/main/java/com/example/demo/DemoApplication.java
This commit is contained in:
@@ -12,6 +12,7 @@ public class DemoApplication {
|
|||||||
SpringApplication.run(DemoApplication.class, args);
|
SpringApplication.run(DemoApplication.class, args);
|
||||||
System.out.println("App running");
|
System.out.println("App running");
|
||||||
System.out.println("add message in master");
|
System.out.println("add message in master");
|
||||||
|
System.out.println("add message from develop_3 branch");
|
||||||
UserEntity.showUserEntityMessage();
|
UserEntity.showUserEntityMessage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user