resolved merge conflict

This commit is contained in:
CocoByte 2025-01-08 11:00:23 -07:00
parent aa01c2283b
commit b27f45b8d7
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F

View file

@ -137,7 +137,7 @@ export class MembersTable extends BaseTable {
}
// This easter egg is only for fixtures that dont have names as we are displaying their emails
// All prod users will have emails linked to their account
if (customTableOptions.needsAdditionalColumn) MembersTable.addMemberDeleteModal(num_domains, member.email || "Samwise Gamgee", member_delete_url, unique_id, row);
if (customTableOptions.isDeletable) MembersTable.addMemberDeleteModal(num_domains, member.email || "Samwise Gamgee", member_delete_url, unique_id, row);
}
/**