chore: resolved conflicts

2024-04-01 21:54:01 +05:30
parent 71a526e7aa 2905a6af1a
commit 0cf9ad5228
6 changed files with 2069 additions and 11 deletions
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -19,7 +19,7 @@
    "chart.js": "^4.4.1",
    "dayjs": "^1.11.6",
    "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.35",
+    "frappe-ui": "^0.1.46",
    "lucide-vue-next": "^0.309.0",
    "markdown-it": "^14.0.0",
    "pinia": "^2.0.33",
@@ -35,4 +35,4 @@
    "postcss": "^8.4.5",
    "vite": "^5.0.11"
  }
-}
+}
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock