Resolved conflicts

2025-01-17 14:31:38 +05:30
parent 68801c0b54
commit e7a93c1f4c
4 changed files with 155 additions and 6 deletions
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -369,5 +369,6 @@ public class GepafinConstant {
    public static final String APPLICATION_PER_STATUS="applicationPerStatus";


+    public static final String CALL_END_DATE_PASSED="call.end.date.passed";
 }