From 80d762cc35ec141154bd5a1b4a6b7807b2674da0 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Mon, 19 May 2025 16:27:44 +0530
Subject: [PATCH] chore: resolved conflict

---
 frontend/package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 5cf1f72e..40e1f47a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -13,11 +13,7 @@
     "@tiptap/extension-paragraph": "^2.12.0",
     "@twilio/voice-sdk": "^2.10.2",
     "@vueuse/integrations": "^10.3.0",
-<<<<<<< HEAD
-    "frappe-ui": "^0.1.121",
-=======
     "frappe-ui": "^0.1.145",
->>>>>>> 1395a12 (build(deps): bump frappeui to 0.1.145)
     "gemoji": "^8.1.0",
     "lodash": "^4.17.21",
     "mime": "^4.0.1",