chore: resolved merge conflicts

2023-08-03 18:01:12 +05:30
parent b9f36d04a8 88f6a4ae26
commit 42cb728577
191 changed files with 9165 additions and 2160 deletions
--- a/packages/hoppscotch-selfhost-web/package.json
+++ b/packages/hoppscotch-selfhost-web/package.json
@@ -66,7 +66,7 @@
    "vite-plugin-html-config": "^1.0.10",
    "vite-plugin-inspect": "^0.7.4",
    "vite-plugin-pages": "^0.26.0",
-    "vite-plugin-pages-sitemap": "^1.4.0",
+    "vite-plugin-pages-sitemap": "^1.4.5",
    "vite-plugin-pwa": "^0.13.1",
    "vite-plugin-static-copy": "^0.12.0",
    "vite-plugin-vue-layouts": "^0.7.0",