resolved conflicts

2024-08-21 20:48:06 +05:30
parent 04e9ff57a7 fa714faef9
commit 9ad51d90ac
12 changed files with 51 additions and 37 deletions
--- a/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java
@@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;

 import lombok.Getter;
 import lombok.Setter;
-import net.gepafin.tendermanagement.entities.BaseEntity;

 import java.time.LocalDateTime;