yuto-oweseek %!s(int64=4) %!d(string=hai) anos
pai
achega
9ca57e7aa7

+ 2 - 1
packages/app/src/components/PageEditor/ConflictDiffModal.tsx

@@ -52,7 +52,8 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
       await pageContainer.resolveConflictAndReload(
       await pageContainer.resolveConflictAndReload(
         pageContainer.state.pageId,
         pageContainer.state.pageId,
         latest.revisionId,
         latest.revisionId,
-        resolvedRevision.current, editorContainer.getCurrentOptionsToSave(),
+        resolvedRevision.current,
+        editorContainer.getCurrentOptionsToSave(),
       );
       );
     }
     }
     catch (error) {
     catch (error) {