Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 00:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-04-27 10:15:15 +08:00
commit 4379b0e25d
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
kernel/model/repository.go
View file

@ -1252,7 +1252,6 @@ func processSyncMergeResult(exit, byHand bool, start time.Time, mergeResult *dej
if util.ContainerAndroid == util.Container || util.ContainerIOS == util.Container {
// 移动端不推送差异详情
upsertRootIDs = []string{}
removeRootIDs = []string{}
}
util.BroadcastByType("main", "syncMergeResult", 0, "",