Fix conflict

2025-01-07 14:04:51 +00:00 · 2025-01-07 14:04:51 +00:00 · 19f39af9ec
parent 2a75f95215
commit 19f39af9ec
1 changed files with 0 additions and 4 deletions
--- a/packages/worker/src/api/controllers/global/self.ts
+++ b/packages/worker/src/api/controllers/global/self.ts
@ -114,11 +114,7 @@ export async function getSelf(ctx: UserCtx<void, GetGlobalSelfResponse>) {
  const sessionAttributes = getUserSessionAttributes(ctx)

  // add the feature flags for this tenant
-<<<<<<< HEAD
  const flags = await features.flags.fetch()
-=======
-  ctx.body.flags = await features.flags.fetch()
->>>>>>> 55685be0814403644bc25d82b3218e27f6590490

  ctx.body = {
    ...enrichedUser,