From b6f52f660a7fbae1f63a0ca7061e61d0dd131402 Mon Sep 17 00:00:00 2001 From: DecDuck Date: Mon, 10 Mar 2025 11:42:33 +1100 Subject: [PATCH] fix: unmerged changes --- server/internal/acls/index.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/server/internal/acls/index.ts b/server/internal/acls/index.ts index 02641a1..d191d59 100644 --- a/server/internal/acls/index.ts +++ b/server/internal/acls/index.ts @@ -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:";