Skip to content

Commit

Permalink
chore: fixup merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
tobybellwood committed Aug 3, 2023
1 parent 28d3394 commit 5b10b05
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion services/api/src/resources/user/resolvers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 5b10b05

Please sign in to comment.