From 3b782989d9b6ecd2c9f12327a41e4bc39cd1d2cc Mon Sep 17 00:00:00 2001 From: Jim Graham Date: Fri, 6 Sep 2024 17:15:12 -0400 Subject: [PATCH] Update modx.grid.role.js Conflict resolution --- manager/assets/modext/widgets/security/modx.grid.role.js | 1 + 1 file changed, 1 insertion(+) diff --git a/manager/assets/modext/widgets/security/modx.grid.role.js b/manager/assets/modext/widgets/security/modx.grid.role.js index 695f4420c5..d264d71f86 100644 --- a/manager/assets/modext/widgets/security/modx.grid.role.js +++ b/manager/assets/modext/widgets/security/modx.grid.role.js @@ -20,6 +20,7 @@ MODx.grid.Role = function(config = {}) { 'name', 'description', 'authority', + // 'perm', 'creator' ], paging: true,