From 6fa5f21dbb134bde9b2e47a1814d3c59e21bb14b Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 21 Aug 2022 13:02:04 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BA=91=E7=AB=AF=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E5=86=B2=E7=AA=81=E6=97=B6=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=89=AF=E6=9C=AC=20https://github.com/siyuan-note/siyuan/issu?= =?UTF-8?q?es/5687?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/repository.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/model/repository.go b/kernel/model/repository.go index ea8ba7f4a..17a63157e 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -553,7 +553,7 @@ func syncRepo(boot, exit, byHand bool) (err error) { absPath := filepath.Join(util.TempDir, "repo", "sync", "conflicts", file.Path) tree, loadTreeErr := loadTree(absPath, luteEngine) if nil != loadTreeErr { - logging.LogErrorf("loadd conflicted file [%s] failed: %s", absPath, loadTreeErr) + logging.LogErrorf("load conflicted file [%s] failed: %s", absPath, loadTreeErr) continue } tree.Box = boxID