s99664/Lab2b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop_3

Browse Source 
# Conflicts:
#	src/main/java/com/example/demo/DemoApplication.java
This commit is contained in:
BartoszPilka
2025-10-16 12:41:11 +02:00
parent d105bd3020 001811c96a
commit 04a40753c4
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,9 +12,7 @@ public class DemoApplication {
System.out.println("Start application 2");
System.out.println("Start application develop_3");
System.out.println("Start application develop_4");
System.out.println("Start application develop_3_podejscie 2");
System.out.println("Start master 2");
SpringApplication.run(DemoApplicationExtra.class, args);
SpringApplication.run(DemoApplication.class, args);
}
}