Resolved conflicts

2025-01-20 21:17:31 +05:30
parent f4f084719f ef25118074
commit f759c04973
11 changed files with 79 additions and 8 deletions
--- a/src/main/resources/message_en.properties
+++ b/src/main/resources/message_en.properties
@@ -351,3 +351,4 @@ user.with.company.not.found = User with company not found for user or company.
 user.action.fetched.successfully = User action details fetched successfully.
 action.context.labels.fetched.successfully = Action Context Labels Fetched Successfully.
 amount.accepted.required=Amount accepted is required while approving the application.
+call.expired=Call has been expired.