Appwrite/console
1
0
Fork 0
mirror of https://github.com/appwrite/console.git synced 2026-06-06 19:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge conflcit

Browse Source
This commit is contained in:
Torsten Dittmann
2024-09-25 10:27:31 +02:00
parent bddb977969
commit 381e2bc7fb
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/(console)/organization-[organization]/members/+page.svelte
+1 -7
View File
@@ -22,15 +22,9 @@
import { base } from '$app/paths';
import { isOwner } from '$lib/stores/roles';
import Edit from './edit.svelte';
import { getRoleLabel, upgradeURL } from '$lib/stores/billing';
import { BillingPlan } from '$lib/constants';
import { isCloud } from '$lib/system';
<<<<<<< HEAD
import { getRoleLabel } from '$lib/stores/billing';
import { Drop } from '$lib/components';
import Upgrade from '$lib/components/roles/upgrade.svelte';
=======
import { Button } from '$lib/elements/forms';
>>>>>>> 8777904fabe7e84099a19823a863170d08a3bfb0
export let data: PageData;