github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge conflicts

Browse Source
This commit is contained in:
Aaryan Khandelwal 2023-03-03 13:38:40 +05:30
parent ad7b691b2b
commit 530edbe149
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app/pages/[workspaceSlug]/settings/billing.tsx
View File

@ -38,7 +38,6 @@ const BillingSettings: NextPage<TBillingSettingsProps> = (props) => {
return ( return (
<> <>
<AppLayout <AppLayout
settingsLayout="workspace"
memberType={props} memberType={props}
breadcrumbs={ breadcrumbs={
<Breadcrumbs> <Breadcrumbs>
@ -49,6 +48,7 @@ const BillingSettings: NextPage<TBillingSettingsProps> = (props) => {
<BreadcrumbItem title="Members Settings" /> <BreadcrumbItem title="Members Settings" />
</Breadcrumbs> </Breadcrumbs>
} }
settingsLayout
> >
<section className="space-y-8"> <section className="space-y-8">
<div> <div>

2
apps/app/pages/[workspaceSlug]/settings/index.tsx
View File

@ -105,7 +105,6 @@ const WorkspaceSettings: NextPage<TWorkspaceSettingsProps> = (props) => {
return ( return (
<AppLayout <AppLayout
settingsLayout="workspace"
memberType={props} memberType={props}
meta={{ meta={{
title: "Plane - Workspace Settings", title: "Plane - Workspace Settings",
@ -115,6 +114,7 @@ const WorkspaceSettings: NextPage<TWorkspaceSettingsProps> = (props) => {
<BreadcrumbItem title={`${activeWorkspace?.name ?? "Workspace"} Settings`} /> <BreadcrumbItem title={`${activeWorkspace?.name ?? "Workspace"} Settings`} />
</Breadcrumbs> </Breadcrumbs>
} }
settingsLayout
> >
<ImageUploadModal <ImageUploadModal
isOpen={isImageUploadModalOpen} isOpen={isImageUploadModalOpen}

2
apps/app/pages/[workspaceSlug]/settings/integrations.tsx
View File

@ -37,7 +37,6 @@ const WorkspaceIntegrations: NextPage<UserAuth> = (props) => {
return ( return (
<> <>
<AppLayout <AppLayout
settingsLayout="workspace"
memberType={props} memberType={props}
breadcrumbs={ breadcrumbs={
<Breadcrumbs> <Breadcrumbs>
@ -48,6 +47,7 @@ const WorkspaceIntegrations: NextPage<UserAuth> = (props) => {
<BreadcrumbItem title="Integrations" /> <BreadcrumbItem title="Integrations" />
</Breadcrumbs> </Breadcrumbs>
} }
settingsLayout
> >
<section className="space-y-8"> <section className="space-y-8">
<div> <div>

2
apps/app/pages/[workspaceSlug]/settings/members.tsx
View File

@ -138,7 +138,6 @@ const MembersSettings: NextPage<TMembersSettingsProps> = (props) => {
members={members} members={members}
/> />
<AppLayout <AppLayout
settingsLayout="workspace"
memberType={props} memberType={props}
breadcrumbs={ breadcrumbs={
<Breadcrumbs> <Breadcrumbs>
@ -149,6 +148,7 @@ const MembersSettings: NextPage<TMembersSettingsProps> = (props) => {
<BreadcrumbItem title="Members Settings" /> <BreadcrumbItem title="Members Settings" />
</Breadcrumbs> </Breadcrumbs>
} }
settingsLayout
> >
<section className="space-y-8"> <section className="space-y-8">
<div> <div>