Resolve Conflicts

This commit is contained in:
rajesh
2025-01-13 16:42:42 +05:30
82 changed files with 1949 additions and 517 deletions

View File

@@ -313,6 +313,7 @@ company.id.required.for.preferred.call=Company ID is required when requesting on
response.days.not.null=Response days should not be null and greater than zero.
application.cannot.approved.or.rejected=Application cannot be approved and rejected because amendment is active.
valid.vatnumber.message=The VAT number is valid.
atleast.one.id.required=At least one of companyId or applicationId must be provided
@@ -347,3 +348,4 @@ notification.updated.successfully=Notification updated successfully.
user.with.company.not.found = User with company not found for user or company.
user.action.fetched.successfully = User action details fetched successfully.
amount.accepted.required=Amount accepted is required while approving the application.