From 4f92be7f4f166a9b30dc12ff16a5d4adeeef4394 Mon Sep 17 00:00:00 2001
From: Min Idzelis <min123@gmail.com>
Date: Tue, 13 May 2025 03:03:43 +0000
Subject: [PATCH] bad merge

---
 web/src/lib/components/photos-page/asset-date-group.svelte | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/web/src/lib/components/photos-page/asset-date-group.svelte b/web/src/lib/components/photos-page/asset-date-group.svelte
index fc9ef6316a..126cfbcf9b 100644
--- a/web/src/lib/components/photos-page/asset-date-group.svelte
+++ b/web/src/lib/components/photos-page/asset-date-group.svelte
@@ -14,14 +14,9 @@
   import { mdiCheckCircle, mdiCircleOutline } from '@mdi/js';
   import { fly, scale } from 'svelte/transition';
   import Thumbnail from '../assets/thumbnail/thumbnail.svelte';
-<<<<<<< HEAD
-  import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
-  import { scale } from 'svelte/transition';
-=======
 
->>>>>>> origin/main
-  import { flip } from 'svelte/animate';
   import { uploadAssetsStore } from '$lib/stores/upload';
+  import { flip } from 'svelte/animate';
 
   let { isUploading } = uploadAssetsStore;