fix: merge conflicts

This commit is contained in:
tglide committed 2023-05-01 15:07:19 +01:00
1 parent af23c0da77
commit d656fbdbf8
3 files changed
+48 -2

No files matched your search

@@ -54,7 +54,7 @@
series={[
{
name: 'Requests',
data: [...requests.map((e) => [e.date, e.value])]
data: [...(requests?.map((e) => [e.date, e.value]) ?? [])]
}
]} />
</div>
+2 -1
View File
@@ -15,7 +15,8 @@
import { Unauthenticated } from '$lib/layout';
import FormList from '$lib/elements/forms/formList.svelte';
import { Dependencies } from '$lib/constants';
import { trackEvent } from '$lib/actions/analytics';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { ID } from '@aw-labs/appwrite-console';
let name: string, mail: string, pass: string, disabled: boolean;
let terms = false;