changed

Readme.txt

@@ -1,3 +1,2 @@
 Inicjalizacja projektu (edycja zdalna)
-Zmiany evee03
-Zmiana s99623
+edycja z new_feature

src/main/java/Lab1/demo/DemoApplication.java

@@ -7,8 +7,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class DemoApplication {
 
 	public static void main(String[] args) {
-		System.out.println("Zmiany");
+		System.out.println("Start application");
+		System.out.println("Conflit develop_3 branch");
 		System.out.println(new Date());
+		System.out.println("changes");
 			SpringApplication.run(DemoApplication.class, args);
 	}