fix: resolved merge conflict

This commit is contained in:
Akhil Mohan
2025-05-30 17:54:57 +00:00
parent 09db9e340b
commit 4efbb8dca6

View File

@@ -68,12 +68,10 @@ const buildAdminPermissionRules = () => {
can( can(
[ [
ProjectPermissionApprovalActions.Read, ProjectPermissionActions.Read,
ProjectPermissionApprovalActions.Edit, ProjectPermissionActions.Edit,
ProjectPermissionApprovalActions.Create, ProjectPermissionActions.Create,
ProjectPermissionApprovalActions.Delete, ProjectPermissionActions.Delete
ProjectPermissionApprovalActions.AllowChangeBypass,
ProjectPermissionApprovalActions.AllowAccessBypass
], ],
ProjectPermissionSub.SecretApproval ProjectPermissionSub.SecretApproval
); );