s99623/Laboratorium2
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conflict develop_3 and develop_4

Browse Source
This commit is contained in:
WikMat
2025-10-14 11:52:16 +02:00
parent 0b436916b2 97f2ac6188
commit 28e53b695e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,11 @@ public class DemoApplication {
public static void main(String[] args) { public static void main(String[] args) {
System.out.println("Drugie polecenie"); System.out.println("Drugie polecenie");
<<<<<<< HEAD
System.out.println("Trzecia gałąź"); System.out.println("Trzecia gałąź");
=======
System.out.println("Czwarta gałąź");
>>>>>>> develop_4
SpringApplication.run(DemoApplication.class, args); SpringApplication.run(DemoApplication.class, args);
} }