EPMRPP-96176 merge conflicts

reportportal · Oct 22, 2024 · e9c6920 · e9c6920
1 parent cdc86a3
commit e9c6920
Showing 1 changed file with 1 addition and 0 deletions.
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
@@ -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;