Resolved Conflicts.

2024-10-25 15:49:28 +05:30
parent d20b9abc07 03e487500a
commit d541492e81
63 changed files with 818 additions and 544 deletions
--- a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java
@@ -2,7 +2,6 @@ package net.gepafin.tendermanagement.model.request;

 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.List;

 import lombok.Data;