1
0
forked from test/crm

chore: resolved conflict

This commit is contained in:
Shariq Ansari 2025-05-19 16:27:44 +05:30 committed by GitHub
parent 3e7e1baf5f
commit 80d762cc35
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -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",