fix: merge conflicts

2023-03-03 13:38:40 +05:30 · 2023-03-03 13:38:40 +05:30 · 530edbe149
commit 530edbe149
parent ad7b691b2b
4 changed files with 4 additions and 4 deletions
--- a/apps/app/pages/[workspaceSlug]/settings/integrations.tsx
+++ b/apps/app/pages/[workspaceSlug]/settings/integrations.tsx
@ -37,7 +37,6 @@ const WorkspaceIntegrations: NextPage<UserAuth> = (props) => {
  return (
    <>
      <AppLayout
-        settingsLayout="workspace"
        memberType={props}
        breadcrumbs={
          <Breadcrumbs>
@ -48,6 +47,7 @@ const WorkspaceIntegrations: NextPage<UserAuth> = (props) => {
            <BreadcrumbItem title="Integrations" />
          </Breadcrumbs>
        }
+        settingsLayout
      >
        <section className="space-y-8">
          <div>