resolve merge conflict

kubero-dev · Sep 27, 2024 · 603f6c8 · 603f6c8
1 parent 13d9156
commit 603f6c8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/client/package.json b/client/package.json
@@ -42,11 +42,7 @@
     "sass": "^1.60.0",
     "typescript": "^5.0.0",
     "unplugin-fonts": "^1.0.3",
-<<<<<<< Updated upstream
-    "vite": "^4.2.0",
-=======
     "vite": "^5.1.8",
->>>>>>> Stashed changes
     "vite-plugin-vuetify": "^1.0.0",
     "vue-tsc": "^2.1.0"
   }