From 5b10b05b2ed93fe0b09bc6329b29296a4f7ba121 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Thu, 3 Aug 2023 20:28:08 +1000 Subject: [PATCH] chore: fixup merge conflict --- services/api/src/resources/user/resolvers.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/services/api/src/resources/user/resolvers.ts b/services/api/src/resources/user/resolvers.ts index 04fe8af26a..4624736408 100644 --- a/services/api/src/resources/user/resolvers.ts +++ b/services/api/src/resources/user/resolvers.ts @@ -5,7 +5,6 @@ import { query, isPatchEmpty } from '../../util/db'; import { logger } from '../../loggers/logger'; import { Helpers as organizationHelpers } from '../organization/helpers'; import { Sql } from './sql'; -import { logger } from '../../loggers/logger'; export const getMe: ResolverFn = async (_root, args, { models, keycloakGrant: grant }) => { const currentUserId: string = grant.access_token.content.sub;