Update packages

2025-09-18 18:44:16 +00:00 · 2022-06-04 21:07:57 +02:00
parent 61eb8f325e
commit 69b1985ac0
2 changed files with 746 additions and 757 deletions
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -11,22 +11,14 @@
  },
  "dependencies": {
    "@popperjs/core": "^2.11.2",
-<<<<<<< HEAD
-    "@quasar/extras": "^1.13.6",
-=======
    "@quasar/extras": "^1.14.0",
->>>>>>> develop
    "apexcharts": "^3.32.1",
    "axios": "^0.21.1",
    "axios-cache-adapter": "^2.7.3",
    "core-js": "^3.6.5",
    "date-fns": "^2.28.0",
-<<<<<<< HEAD
    "pinia": "^2.0.13",
    "quasar": "^2.6.6",
-=======
-    "quasar": "^2.7.1",
->>>>>>> develop
    "vue": "3",
    "vue-i18n": "^9.0.0",
    "vue-router": "^4.0.0",
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock