Resolve conflicts

pingcap · Aug 1, 2021 · 530f87d · 530f87d
1 parent 35f804f
commit 530f87d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/cdc/processor/pipeline/sink.go b/cdc/processor/pipeline/sink.go
@@ -142,9 +142,6 @@ func (n *sinkNode) flushSink(ctx pipeline.NodeContext, resolvedTs model.Ts) (err
 }
 
 func (n *sinkNode) emitEvent(ctx pipeline.NodeContext, event *model.PolymorphicEvent) error {
-<<<<<<< HEAD
-	n.eventBuffer = append(n.eventBuffer, event)
-=======
 	if event == nil || event.Row == nil {
 		return nil
 	}
@@ -173,7 +170,6 @@ func (n *sinkNode) emitEvent(ctx pipeline.NodeContext, event *model.PolymorphicE
 		n.eventBuffer = append(n.eventBuffer, event)
 	}
 
->>>>>>> f2526c1e (sink(refactor): Refine functions and improve event splitting code (#2367))
 	if len(n.eventBuffer) >= defaultSyncResolvedBatch {
 		if err := n.flushRow2Sink(ctx); err != nil {
 			return errors.Trace(err)