From 135357a4555e6c7bc53730ea5a03040af3ef5578 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 20 Mar 2026 17:35:47 +0530 Subject: [PATCH] fix: merge conflict issues --- .../widgets/WootWriter/ReplyBottomPanel.vue | 9 +- pnpm-lock.yaml | 7053 +++++------------ 2 files changed, 2090 insertions(+), 4972 deletions(-) diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue index 98183f131..4b3e01d64 100644 --- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue +++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue @@ -116,7 +116,6 @@ export default { }, allowSignature: { type: Boolean, default: false }, allowEmoji: { type: Boolean, default: false }, - allowAiAssist: { type: Boolean, default: false }, allowVideoCall: { type: Boolean, default: false }, allowFileUpload: { type: Boolean, default: false }, allowAudioRecorder: { type: Boolean, default: false }, @@ -297,8 +296,7 @@ export default {
-