Merge branch 'develop_1'

# Conflicts: # src/main/java/com/example/demo/DemoApplication.java
2025-10-02 15:24:03 +02:00
parent 20bca0754f c4aebd806c
commit d63b995dc5
1 changed files with 4 additions and 0 deletions
--- a/src/main/java/controller/UserController.java
+++ b/src/main/java/controller/UserController.java
@@ -0,0 +1,4 @@
+package controller;
+
+public class UserController {
+}