From e9c69207f774fe315222702996bc0d9e5a2146ad Mon Sep 17 00:00:00 2001
From: siarhei_hrabko <siarhei_hrabko@epam.com>
Date: Tue, 22 Oct 2024 11:58:46 +0300
Subject: [PATCH] EPMRPP-96176 merge conflicts

---
 src/main/java/com/epam/ta/reportportal/entity/user/User.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/epam/ta/reportportal/entity/user/User.java b/src/main/java/com/epam/ta/reportportal/entity/user/User.java
index b04983c01..90daba932 100644
--- a/src/main/java/com/epam/ta/reportportal/entity/user/User.java
+++ b/src/main/java/com/epam/ta/reportportal/entity/user/User.java
@@ -37,6 +37,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;