浏览代码

enhance(sync): make smart merge the default option

Andelf 2 年之前
父节点
当前提交
d39a61a008
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      src/main/frontend/state.cljs

+ 1 - 1
src/main/frontend/state.cljs

@@ -281,7 +281,7 @@
 
 
      :ui/loading?                           {}
      :ui/loading?                           {}
      :feature/enable-sync?                  (storage/get :logseq-sync-enabled)
      :feature/enable-sync?                  (storage/get :logseq-sync-enabled)
-     :feature/enable-sync-diff-merge?       (storage/get :logseq-sync-diff-merge-enabled)
+     :feature/enable-sync-diff-merge?       ((fnil identity true) (storage/get :logseq-sync-diff-merge-enabled))
 
 
      :file/rename-event-chan                (async/chan 100)
      :file/rename-event-chan                (async/chan 100)
      :ui/find-in-page                       nil
      :ui/find-in-page                       nil