From 7dab1256409280c3595e2d76a38db1795cefa7ba Mon Sep 17 00:00:00 2001 From: qupeng Date: Sun, 17 Dec 2023 13:28:12 +0800 Subject: [PATCH] fix conflicts Signed-off-by: qupeng --- cdc/processor/sinkmanager/manager.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cdc/processor/sinkmanager/manager.go b/cdc/processor/sinkmanager/manager.go index 2d4a0eb1c6a..d7101b4b969 100644 --- a/cdc/processor/sinkmanager/manager.go +++ b/cdc/processor/sinkmanager/manager.go @@ -188,7 +188,6 @@ func New( } m.ready = make(chan struct{}) -<<<<<<< HEAD m.wg.Add(1) // So `SinkManager.Close` will also wait the subroutine. go func() { if err := m.run(ctx, warnChan); err != nil && errors.Cause(err) != context.Canceled { @@ -200,9 +199,6 @@ func New( }() <-m.ready return m, nil -======= - return m ->>>>>>> 844b41bed4 (redo(cdc): custom redo event cache and disable it by default (#10139)) } func (m *SinkManager) run(ctx context.Context, warnings ...chan<- error) (err error) {