Resolved conflicts while sync with master

2025-11-17 15:10:49 +05:30
parent 326ce77e8c 2dbf8bf99f
commit d50f3c5a8a
5 changed files with 12 additions and 12 deletions
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -635,6 +635,7 @@ public class GepafinConstant {
    public static final String EMAIL_LOG_FETCHED="email.log.fetched";
    public static final String APPLICATION_AMENDMENT_APPROPIATE_STATUS="amendment.appropiate.status";

+
 }