Skip to content

Commit d2dcdd8

Browse files
Kira-PilotKira-Pilot
committed
resolving in flight conflicts
1 parent dd94aca commit d2dcdd8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

‎site/src/pages/TemplatesPage/TemplatesPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { AvatarData } from "../../components/AvatarData/AvatarData"
1515
import { CodeExample } from "../../components/CodeExample/CodeExample"
1616
import { EmptyState } from "../../components/EmptyState/EmptyState"
1717
import { Margins } from "../../components/Margins/Margins"
18-
import { PageHeader, PageHeaderText, PageHeaderTitle } from "../../components/PageHeader/PageHeader"
18+
import { PageHeader, PageHeaderSubtitle, PageHeaderTitle } from "../../components/PageHeader/PageHeader"
1919
import { Stack } from "../../components/Stack/Stack"
2020
import { TableLoader } from "../../components/TableLoader/TableLoader"
2121
import {

‎site/src/pages/WorkspacesPage/WorkspacesPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { AvatarData } from "../../components/AvatarData/AvatarData"
2525
import { CloseDropdown, OpenDropdown } from "../../components/DropdownArrows/DropdownArrows"
2626
import { EmptyState } from "../../components/EmptyState/EmptyState"
2727
import { Margins } from "../../components/Margins/Margins"
28-
import { PageHeader, PageHeaderText, PageHeaderTitle } from "../../components/PageHeader/PageHeader"
28+
import { PageHeader, PageHeaderSubtitle, PageHeaderTitle } from "../../components/PageHeader/PageHeader"
2929
import { Stack } from "../../components/Stack/Stack"
3030
import { TableLoader } from "../../components/TableLoader/TableLoader"
3131
import {

0 commit comments

Comments
 (0)