Skip to content

Commit

Permalink
fix: Cleanup a few improper merge conflict resolutions with import st…
Browse files Browse the repository at this point in the history
…atements
  • Loading branch information
techniq committed Oct 20, 2024
1 parent fce6618 commit 0fcac5e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
3 changes: 1 addition & 2 deletions packages/svelte-ux/src/lib/components/Notification.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script lang="ts">
import { Notification, toTitleCase } from 'svelte-ux';
import { colors } from '$lib/styles/theme.js';
import { Notification } from 'svelte-ux';
import { colors } from '@layerstack/tailwind';
import { toTitleCase } from '@layerstack/utils';
import {
mdiInbox,
Expand Down

0 comments on commit 0fcac5e

Please sign in to comment.