resolve merge conflicts: keep incoming .env version, incoming nominee HTML, HEAD guardian SCSS

This commit is contained in:
Nitesh Yadav
2026-05-15 13:17:44 +05:30
35 changed files with 4394 additions and 191 deletions
+5 -5
View File
@@ -1139,8 +1139,8 @@
"Extend Repayment Period": "Extend Repayment Period",
"External Asset Owner": "External Asset Owner",
"External Services": "External Services",
"Family Member": "Nominee",
"Family Members": "Nominee",
"Family Member": "Family Member",
"Family Members": "Family Members",
"Fee Amount": "Fee Amount",
"Fees to Specific Income Accounts": "Fees to Specific Income Accounts",
"Filter holidays": "Search bar to filter holidays based on different offices.",
@@ -1977,7 +1977,7 @@
"FCM End Point": "FCM End Point",
"Failed to load vendors": "Failed to load vendors",
"Failure Count": "Failure Count",
"Family Members": "Nominee",
"Family Members": "Family Members",
"Father": "Father",
"Father's Name": "Father's Name",
"Favicon": "Favicon",
@@ -3586,8 +3586,8 @@
"Failed to load complaints": "Failed to load complaints",
"Failed to search clients. Please try again.": "Failed to search clients. Please try again.",
"Failed to submit action": "Failed to submit action",
"Family Member View": "Nominee View",
"Family Members": "Nominee",
"Family Member View": "Family Member View",
"Family Members": "Family Members",
"Filling Details": "Click to start filling the details. * mark fields are necessary. For more details click:",
"Filter by name": "Filter by name",
"FilterByLoanIdOrError": "Filter by loan Id or error",