fix: merge conflicts

This commit is contained in:
=
2024-05-31 23:10:02 +05:30
parent 346dbee96a
commit cec884ce34
+1 -1
View File
@@ -291,7 +291,7 @@ export const registerRoutes = async (
permissionService, permissionService,
auditLogStreamDAL auditLogStreamDAL
}); });
const sapService = secretApprovalPolicyServiceFactory({ const secretApprovalPolicyService = secretApprovalPolicyServiceFactory({
projectMembershipDAL, projectMembershipDAL,
projectEnvDAL, projectEnvDAL,
secretApprovalPolicyApproverDAL: sapApproverDAL, secretApprovalPolicyApproverDAL: sapApproverDAL,