From ca4c2e6d484d4c7eaf2e7e03e24740b11a6f1eca Mon Sep 17 00:00:00 2001 From: Ewelina Date: Tue, 21 Oct 2025 11:26:20 +0200 Subject: [PATCH] changes --- lab | 1 + src/main/java/Lab1/demo/DemoApplication.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 160000 lab diff --git a/lab b/lab new file mode 160000 index 0000000..e53ced0 --- /dev/null +++ b/lab @@ -0,0 +1 @@ +Subproject commit e53ced08f4debf7fd726d0a31b69204c542d1756 diff --git a/src/main/java/Lab1/demo/DemoApplication.java b/src/main/java/Lab1/demo/DemoApplication.java index 07c6d3a..6d0ce96 100644 --- a/src/main/java/Lab1/demo/DemoApplication.java +++ b/src/main/java/Lab1/demo/DemoApplication.java @@ -7,8 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; public class DemoApplication { public static void main(String[] args) { - System.out.println("Start application"); - System.out.println("Conflit develop_3 branch"); + System.out.println("Zmiany"); System.out.println(new Date()); SpringApplication.run(DemoApplication.class, args); }