commit

amidaware · Jan 10, 2022 · 18affcf · 18affcf
1 parent 9d763f0
commit 18affcf
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -15,11 +15,7 @@
     "axios": "^0.24.0",
     "dotenv": "^8.6.0",
     "qrcode.vue": "^3.2.2",
-<<<<<<< HEAD
     "quasar": "^2.4.4",
-=======
-    "quasar": "^2.4.3",
->>>>>>> massive cleanup of files and restructure of integrations design
     "vue3-ace-editor": "^2.2.1",
     "vue3-apexcharts": "^1.4.0",
     "vuedraggable": "^4.1.0",