MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

This commit is contained in:
Andrew Kingston 2025-01-07 14:04:51 +00:00
parent 2a75f95215
commit 19f39af9ec
No known key found for this signature in database
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/worker/src/api/controllers/global/self.ts
View File

@ -114,11 +114,7 @@ export async function getSelf(ctx: UserCtx<void, GetGlobalSelfResponse>) {
const sessionAttributes = getUserSessionAttributes(ctx) const sessionAttributes = getUserSessionAttributes(ctx)
// add the feature flags for this tenant // add the feature flags for this tenant
<<<<<<< HEAD
const flags = await features.flags.fetch() const flags = await features.flags.fetch()
=======
ctx.body.flags = await features.flags.fetch()
>>>>>>> 55685be0814403644bc25d82b3218e27f6590490
ctx.body = { ctx.body = {
...enrichedUser, ...enrichedUser,