Merge branch 'hotfix/v3.0.1' of git.onlyoffice.com:ONLYOFFICE/DocSpac…

…e-client into hotfix/v3.0.1
ONLYOFFICE · Dec 11, 2024 · 142cb71 · 142cb71
2 parents 4e9319a + 1d00d7f
commit 142cb71
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx b/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx
@@ -285,7 +285,7 @@ const ConflictResolveDialog = (props: ConflictResolveDialogProps) => {
   const onCloseConflictDialog = () => {
     if (isUploadConflict) {
       cancelUploadAction();
-      onCloseDialog();
+      onClose();
     } else onCloseDialog();
   };