pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-04 09:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rebase

Browse Source
This commit is contained in:
Owen
2025-10-06 10:16:29 -07:00
parent 850e9a734a
commit 6105eea7a9
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/[orgId]/settings/resources/[niceId]/authentication/page.tsx
View File

@@ -58,13 +58,10 @@ import {
SelectTrigger, SelectTrigger,
SelectValue SelectValue
} from "@app/components/ui/select"; } from "@app/components/ui/select";
<<<<<<< HEAD
import { Separator } from "@app/components/ui/separator"; import { Separator } from "@app/components/ui/separator";
import { build } from "@server/build"; import { build } from "@server/build";
import { usePrivateSubscriptionStatusContext } from "@app/hooks/privateUseSubscriptionStatusContext"; import { usePrivateSubscriptionStatusContext } from "@app/hooks/privateUseSubscriptionStatusContext";
import { TierId } from "@server/lib/private/billing/tiers"; import { TierId } from "@server/lib/private/billing/tiers";
=======
>>>>>>> 6f6c351f (Adding HTTP Header Authentication)
const UsersRolesFormSchema = z.object({ const UsersRolesFormSchema = z.object({
roles: z.array( roles: z.array(