From c15ed245d7a969b89ac4d2f674a53a7a850f6d33 Mon Sep 17 00:00:00 2001
From: IgorNiemiec <igorni3miec@gmail.com>
Date: Tue, 14 Oct 2025 11:31:27 +0200
Subject: [PATCH] Confilcts Resolved

---
 src/main/java/com/example/demo/DemoApplication.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java
index 4c0b84f..b73d530 100644
--- a/src/main/java/com/example/demo/DemoApplication.java
+++ b/src/main/java/com/example/demo/DemoApplication.java
@@ -8,6 +8,12 @@ public class DemoApplication {
 
 	public static void main(String[] args) {
 		System.out.println("Start application");
+<<<<<<< HEAD
+		System.out.println("Develop_1 Console");
+		System.out.println("Develop_2 Console");
+		UserEntity.Show();
+
+>>>>>>> Develop_1
 		SpringApplication.run(DemoApplication.class, args);
 	}