fix the conflicts
This commit is contained in:
parent
94872bbb20
commit
6ea64ea832
|
|
@ -76,7 +76,9 @@ func (e *Editor) loadSegments() error {
|
||||||
var last *Segment = nil
|
var last *Segment = nil
|
||||||
var tStart = time.Now()
|
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
|
// check the continuity of the data segment
|
||||||
if err := seg.AfterCheck(last); err != nil {
|
if err := seg.AfterCheck(last); err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue