binarybeach/bb-plane-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolved merge conflict

Browse source
This commit is contained in:
Dakshesh Jain 2022-12-08 20:35:27 +05:30
commit 9c33c3c87f
32 changed files with 939 additions and 1323 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/app/pages/workspace/settings.tsx
View file

@ -11,7 +11,8 @@ import fileServices from "lib/services/file.services";
// hoc
import withAuth from "lib/hoc/withAuthWrapper";
// layouts
import AdminLayout from "layouts/AdminLayout";
import AppLayout from "layouts/AppLayout";
// hooks
import useUser from "lib/hooks/useUser";
import useToast from "lib/hooks/useToast";
@ -84,7 +85,7 @@ const WorkspaceSettings = () => {
};
return (
<AdminLayout
<AppLayout
meta={{
title: "Plane - Workspace Settings",
}}
@ -229,7 +230,7 @@ const WorkspaceSettings = () => {
</div>
)}
</div>
</AdminLayout>
</AppLayout>
);
};