Rozwiazano konflikt

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

@@ -8,8 +8,7 @@ public class DemoApplication {
 
 	public static void main(String[] args) {
         System.out.println("Start application");
-        System.out.println("Kolejny komunikat");
+        System.out.println("Drugi komunikat");
-
         SpringApplication.run(DemoApplication.class, args);
 	}
 

demo/src/main/java/com/example/demo/User.java

@@ -1,4 +1,4 @@
 package com.example.demo;
 
-public class klasa2 {
+public class User {
 }

demo/src/main/java/com/example/demo/controller/UserController.java

@@ -0,0 +1,4 @@
+package com.example.demo.controller;
+
+public class UserController {
+}

demo/src/main/java/com/example/demo/klasa3.java

@@ -1,4 +0,0 @@
-package com.example.demo;
-
-public class klasa3 {
-}