From 4df7fe0ac7d3feedb5078a8879bcc2d9aa8663f1 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Fri, 28 Nov 2025 15:23:16 +1300
Subject: [PATCH] Fixes

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

diff --git a/materialious/package.json b/materialious/package.json
index 7c1b80aa..796ab139 100644
--- a/materialious/package.json
+++ b/materialious/package.json
@@ -36,11 +36,8 @@
 		"svelte-check": "^4.3.3",
 		"tslib": "^2.7.0",
 		"typescript": "^5.9.3",
-<<<<<<< HEAD
 		"typescript-eslint": "^8.47.0",
-
 		"vite": "^7.2.4"
->>>>>>> origin/dependabot/npm_and_yarn/materialious/vite-7.2.4
 	},
 	"type": "module",
 	"dependencies": {