fix: resolve merge conflicts in app.css, +layout.svelte, and package.json

Author: DarthGigi

package.json

@@ -22,11 +22,7 @@
     "@sveltejs/adapter-node": "^5.2.12",
     "@sveltejs/kit": "^2.16.1",
     "@sveltejs/vite-plugin-svelte": "^5.0.3",
-<<<<<<< HEAD
     "@tailwindcss/vite": "^4.0.3",
-=======
-    "@tailwindcss/vite": "^4.0.2",
->>>>>>> prod
     "@types/eslint": "^9.6.1",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash": "^4.17.15",
@@ -70,11 +66,6 @@
     "svelte-tiny-virtual-list": "^2.1.2",
     "sveltekit-superforms": "^2.23.1",
     "tailwind-merge": "^3.0.1",
-<<<<<<< HEAD
-    "tailwindcss": "^4.0.3",
-=======
-    "tailwindcss": "^4.0.2",
->>>>>>> prod
     "tslib": "^2.8.1",
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.22.0",

pnpm-lock.yaml

@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 @import url("https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100..900;1,100..900&display=swap") layer(base);
-=======
->>>>>>> prod
 @import "tailwindcss";
 @plugin "./plugins/text-shadow.ts";
 @plugin "./plugins/themes.ts";

src/app.css

@@ -15,7 +15,6 @@
   import { Toaster, toast } from "svelte-sonner";
   import { writable } from "svelte/store";
   import "../app.css";
-  import "../fonts.css";
 
   const position = writable<ToasterProps["position"]>("bottom-right");
   const theme = writable<ToasterProps["theme"]>("dark");