From 7e3286362f15b99e9a7780950c81f82733fe79d5 Mon Sep 17 00:00:00 2001
From: BOTAlex <zhentao2004@gmail.com>
Date: Wed, 13 Aug 2025 22:28:54 +0200
Subject: [PATCH] fixed merge conflict

---
 package.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package.json b/package.json
index 32abb1f..e37e249 100644
--- a/package.json
+++ b/package.json
@@ -33,14 +33,11 @@
 	},
 	"type": "module",
 	"dependencies": {
-<<<<<<< Updated upstream
-=======
 		"@lucide/svelte": "^0.487.0",
 		"@tailwindcss/vite": "^4.1.3",
 		"lucide-svelte": "^0.475.0",
 		"pocketbase": "^0.26.2",
 		"svelte-katex": "^0.1.2",
->>>>>>> Stashed changes
 		"svelte-media-queries": "^1.6.2",
 		"svelte-particles": "^2.12.0",
 		"theme-change": "^2.5.0",