From 88d88bebc904ffa2630ff0344618e18af14e30cc Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sun, 22 Sep 2024 09:33:39 +0200
Subject: [PATCH] Fix package thing

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

diff --git a/package-lock.json b/package-lock.json
index 795d11022d..ee7ae069c9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10042,15 +10042,9 @@
             }
         },
         "node_modules/vite": {
-<<<<<<< HEAD
             "version": "5.4.5",
             "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.5.tgz",
             "integrity": "sha512-pXqR0qtb2bTwLkev4SE3r4abCNioP3GkjvIDLlzziPpXtHgiJIjuKl+1GN6ESOT3wMjG3JTeARopj2SwYaHTOA==",
-=======
-            "version": "5.3.6",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.6.tgz",
-            "integrity": "sha512-es78AlrylO8mTVBygC0gTC0FENv0C6T496vvd33ydbjF/mIi9q3XQ9A3NWo5qLGFKywvz10J26813OkLvcQleA==",
->>>>>>> main
             "dev": true,
             "dependencies": {
                 "esbuild": "^0.21.3",