From dd0b8758fba6c00ea478a9bd6ca243824f69a445 Mon Sep 17 00:00:00 2001
From: Ewelina <ewelina.musinska@gmail.com>
Date: Tue, 14 Oct 2025 11:28:43 +0200
Subject: [PATCH] Add UserEntity and changed DemoApplication

---
 src/main/java/Lab1/demo/DemoApplication.java   | 1 +
 src/main/java/Lab1/demo/domain/UserEntity.java | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 src/main/java/Lab1/demo/domain/UserEntity.java

diff --git a/src/main/java/Lab1/demo/DemoApplication.java b/src/main/java/Lab1/demo/DemoApplication.java
index 28176ff..4094652 100644
--- a/src/main/java/Lab1/demo/DemoApplication.java
+++ b/src/main/java/Lab1/demo/DemoApplication.java
@@ -8,6 +8,7 @@ public class DemoApplication {
 
 	public static void main(String[] args) {
 		System.out.println("Start application");
+		System.out.println("Conflit");
 			SpringApplication.run(DemoApplication.class, args);
 	}
 
diff --git a/src/main/java/Lab1/demo/domain/UserEntity.java b/src/main/java/Lab1/demo/domain/UserEntity.java
new file mode 100644
index 0000000..a43c579
--- /dev/null
+++ b/src/main/java/Lab1/demo/domain/UserEntity.java
@@ -0,0 +1,2 @@
+class UserEntity {
+}
\ No newline at end of file