Skip to content

Commit

Permalink
fix(repo): Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
panteliselef committed Nov 27, 2023
1 parent 83abc2e commit 13eb8df
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { useOrganization } from '@clerk/shared/react';
import React from 'react';

import { useOrganizationProfileContext } from '../../contexts';
import { useGate } from '../../common';
import { ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID } from '../../constants';
import { useOrganizationProfileContext } from '../../contexts';
import { Breadcrumbs, NavBar, NavbarContextProvider, OrganizationPreview } from '../../elements';
import type { PropsOfComponent } from '../../styledSystem';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { useUser } from '@clerk/shared/react';
import type { SamlAccountResource } from '@clerk/types';

import { useRouter } from '../../router';
import { Badge, Col, descriptors, Flex, Image, localizationKeys } from '../../customizables';
import { ProfileSection, UserPreview } from '../../elements';
import { useSaml } from '../../hooks';
import { useRouter } from '../../router';
import { UserProfileAccordion } from './UserProfileAccordion';

export const EnterpriseAccountsSection = () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/contexts/IsomorphicClerkContext.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ClerkInstanceContext, useClerkInstanceContext } from '@clerk/shared/react';

import type IsomorphicClerk from '../isomorphicClerk';
import type { IsomorphicClerk } from '../isomorphicClerk';

export const IsomorphicClerkContext = ClerkInstanceContext;
export const useIsomorphicClerkContext = useClerkInstanceContext as unknown as () => IsomorphicClerk;

0 comments on commit 13eb8df

Please sign in to comment.