From 0fcac5ec99366b043ff47c31f30695d57eb08a3e Mon Sep 17 00:00:00 2001 From: Sean Lynch Date: Sat, 19 Oct 2024 21:34:49 -0400 Subject: [PATCH] fix: Cleanup a few improper merge conflict resolutions with import statements --- packages/svelte-ux/src/lib/components/Notification.svelte | 3 +-- .../src/routes/docs/components/Notification/+page.svelte | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/svelte-ux/src/lib/components/Notification.svelte b/packages/svelte-ux/src/lib/components/Notification.svelte index c8f058d2..f6193bd9 100644 --- a/packages/svelte-ux/src/lib/components/Notification.svelte +++ b/packages/svelte-ux/src/lib/components/Notification.svelte @@ -2,8 +2,7 @@ import { createEventDispatcher, type ComponentProps } from 'svelte'; import { fly } from 'svelte/transition'; import { quadIn } from 'svelte/easing'; - import type { ThemeColors } from '$lib/types/typeHelpers.js'; - import { cls } from '$lib/utils/styles.js'; + import { cls, type ThemeColors } from '@layerstack/tailwind'; import { mdiClose } from '@mdi/js'; diff --git a/packages/svelte-ux/src/routes/docs/components/Notification/+page.svelte b/packages/svelte-ux/src/routes/docs/components/Notification/+page.svelte index 740d337c..850f104a 100644 --- a/packages/svelte-ux/src/routes/docs/components/Notification/+page.svelte +++ b/packages/svelte-ux/src/routes/docs/components/Notification/+page.svelte @@ -1,6 +1,7 @@