Conflict develop_3 and develop_4

src/main/java/com/lab1/demo/DemoApplication.java

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