fix: unmerged changes

This commit is contained in:
DecDuck
2025-03-10 11:42:33 +11:00
parent a1f65b7e59
commit b6f52f660a

View File

@ -25,11 +25,8 @@ export const userACLs = [
"collections:remove",
"library:add",
"library:remove",
<<<<<<< HEAD
=======
"news:read",
>>>>>>> AdenMGB-develop
] as const;
const userACLPrefix = "user:";
@ -56,13 +53,10 @@ export const systemACLs = [
"import:game:new",
"user:read",
<<<<<<< HEAD
=======
"news:read",
"news:create",
"news:delete",
>>>>>>> AdenMGB-develop
] as const;
const systemACLPrefix = "system:";