resolved conflicts

This commit is contained in:
harish
2024-10-19 13:24:07 +05:30
19 changed files with 314 additions and 51 deletions

View File

@@ -253,6 +253,8 @@ get_login_attempt_se_msg=Login attempts fetched successfully.
application.in.submit.status.cannot.delete.company=The company cannot be deleted because there are active applications in the SUBMITTED status.
get.users.success.msg = Successfully fetched users.
cannot.create.beneficiary.user = Creation of a Beneficiary user is not allowed. Please assign the appropriate role.
evaluationCriteria.invalid=This evaluation criterion does not belong to the current call.
# Hub Messages
hub_create_success=Hub created successfully