fixed merge conflict
This commit is contained in:
parent
ecc02665f6
commit
7e3286362f
1 changed files with 0 additions and 3 deletions
|
|
@ -33,14 +33,11 @@
|
||||||
},
|
},
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
<<<<<<< Updated upstream
|
|
||||||
=======
|
|
||||||
"@lucide/svelte": "^0.487.0",
|
"@lucide/svelte": "^0.487.0",
|
||||||
"@tailwindcss/vite": "^4.1.3",
|
"@tailwindcss/vite": "^4.1.3",
|
||||||
"lucide-svelte": "^0.475.0",
|
"lucide-svelte": "^0.475.0",
|
||||||
"pocketbase": "^0.26.2",
|
"pocketbase": "^0.26.2",
|
||||||
"svelte-katex": "^0.1.2",
|
"svelte-katex": "^0.1.2",
|
||||||
>>>>>>> Stashed changes
|
|
||||||
"svelte-media-queries": "^1.6.2",
|
"svelte-media-queries": "^1.6.2",
|
||||||
"svelte-particles": "^2.12.0",
|
"svelte-particles": "^2.12.0",
|
||||||
"theme-change": "^2.5.0",
|
"theme-change": "^2.5.0",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue