LukaszK/DemoApplication
1
0
Fork 0
forked from MKoziel/DemoApplication
Code Pull Requests Activity

Merge branch 'develop_4'

Browse Source 
# Conflicts:
#	src/main/java/com/example/demo/DemoApplication.java
This commit is contained in:
mateusz
2025-10-02 15:28:24 +02:00
parent e4b02a53c7 2967e14c9c
commit 44dce416b7
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/example/demo/DemoApplication.java
View File

@@ -11,6 +11,7 @@ public class DemoApplication {
System.out.println("Start application"); System.out.println("Start application");
SpringApplication.run(DemoApplication.class, args); SpringApplication.run(DemoApplication.class, args);
System.out.println("App running"); System.out.println("App running");
System.out.println("message from develop_4 branch");
System.out.println("add message in master"); System.out.println("add message in master");
System.out.println("add message from develop_3 branch"); System.out.println("add message from develop_3 branch");
UserEntity.showUserEntityMessage(); UserEntity.showUserEntityMessage();