Resolved conflicts

2024-11-18 13:09:36 +05:30
parent 9635ec966c 3d107e65fb
commit 10e92babf9
23 changed files with 364 additions and 250 deletions
--- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
+++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
@@ -291,5 +291,6 @@ public class GepafinConstant {
    public static final String ENCRYPT_INIT_VECTOR = "IG8*(*@&)*#biVVD";
    public static final String ENCRYPT_KEY = "U2VjdXJlRW5jcnlwdEtleQ==";
    public static final String APPLICATION_DOCUMENTS_NOT_FOUND_MSG = "application.documents.not.found";
+    public static final String DUPLICATE_BENEFICIARY_CALL = "beneficiary.call.duplicate";
 }