Skip to content

Commit

Permalink
fix: fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
PupoSDC committed Feb 10, 2024
1 parent b63682c commit 345a5a9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion libs/next/tests/src/containers/test-maker/test-maker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import {
useTheme,
Sheet,
} from "@mui/joy";
import { useTrackEvent } from "libs/next/analytics/src";
import { getNumberOfAvailableQuestions } from "@chair-flight/core/question-bank";
import { newTestConfigurationSchema } from "@chair-flight/core/tests";
import { useTrackEvent } from "@chair-flight/next/analytics";
import { useBugReportDebugData } from "@chair-flight/next/user";
import {
HookFormSelect,
Expand Down
2 changes: 1 addition & 1 deletion libs/next/user/src/components/app-buttons/app-buttons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import {
Tooltip,
Stack,
} from "@mui/joy";
import { useTrackEvent } from "libs/next/analytics/src";
import { DateTime } from "luxon";
import { useTrackEvent } from "@chair-flight/next/analytics";
import { useSidebar, noSsr } from "@chair-flight/react/components";
import { trpc } from "@chair-flight/trpc/client";
import { useBugReportDisclose } from "../../hooks/use-bug-report";
Expand Down

0 comments on commit 345a5a9

Please sign in to comment.