From 6ea64ea83259f1a3bab11ff9d3861aa9dc7e9364 Mon Sep 17 00:00:00 2001 From: Lion Date: Sun, 4 Dec 2022 17:27:09 +0800 Subject: [PATCH] fix the conflicts --- maker/golang/xdb/editor.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maker/golang/xdb/editor.go b/maker/golang/xdb/editor.go index 733b4f4..84f2d93 100644 --- a/maker/golang/xdb/editor.go +++ b/maker/golang/xdb/editor.go @@ -76,7 +76,9 @@ func (e *Editor) loadSegments() error { var last *Segment = nil var tStart = time.Now() - var err = IterateSegments(e.srcHandle, nil, func(seg *Segment) error { + var err = IterateSegments(e.srcHandle, func(l string) { + // do nothing here + }, func(seg *Segment) error { // check the continuity of the data segment if err := seg.AfterCheck(last); err != nil { return err