mirror of
https://github.com/Drop-OSS/drop.git
synced 2025-11-12 15:52:39 +10:00
fix: unmerged changes
This commit is contained in:
@ -25,11 +25,8 @@ export const userACLs = [
|
|||||||
"collections:remove",
|
"collections:remove",
|
||||||
"library:add",
|
"library:add",
|
||||||
"library:remove",
|
"library:remove",
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
|
|
||||||
"news:read",
|
"news:read",
|
||||||
>>>>>>> AdenMGB-develop
|
|
||||||
] as const;
|
] as const;
|
||||||
const userACLPrefix = "user:";
|
const userACLPrefix = "user:";
|
||||||
|
|
||||||
@ -56,13 +53,10 @@ export const systemACLs = [
|
|||||||
"import:game:new",
|
"import:game:new",
|
||||||
|
|
||||||
"user:read",
|
"user:read",
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
|
|
||||||
"news:read",
|
"news:read",
|
||||||
"news:create",
|
"news:create",
|
||||||
"news:delete",
|
"news:delete",
|
||||||
>>>>>>> AdenMGB-develop
|
|
||||||
] as const;
|
] as const;
|
||||||
const systemACLPrefix = "system:";
|
const systemACLPrefix = "system:";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user