|
@@ -42,7 +42,7 @@ export const PageStatusAlert = (): JSX.Element => {
|
|
|
}, [mutateEditingMarkdown, mutatePageData]);
|
|
}, [mutateEditingMarkdown, mutatePageData]);
|
|
|
|
|
|
|
|
const onClickResolveConflict = useCallback(() => {
|
|
const onClickResolveConflict = useCallback(() => {
|
|
|
- openConflictDiffModal();
|
|
|
|
|
|
|
+ // openConflictDiffModal();
|
|
|
}, [openConflictDiffModal]);
|
|
}, [openConflictDiffModal]);
|
|
|
|
|
|
|
|
// TODO: re-impl for builtin editor
|
|
// TODO: re-impl for builtin editor
|