fix merge conflict

pingcap · Aug 15, 2021 · f37d3b1 · f37d3b1
1 parent 0187468
commit f37d3b1
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/cdc/processor.go b/cdc/processor.go
@@ -818,14 +818,8 @@ func (p *oldProcessor) addTable(ctx context.Context, tableID int64, replicaInfo
 		}
 		// NOTICE: always pull the old value internally
 		// See also: TODO(hi-rustin): add issue link here.
-<<<<<<< HEAD
-		plr := puller.NewPuller(ctx, p.pdCli, p.credential, kvStorage,
-			replicaInfo.StartTs, []regionspan.Span{span}, true)
-=======
 		plr := puller.NewPuller(ctx, p.pdCli, p.grpcPool, kvStorage,
-			replicaInfo.StartTs, []regionspan.Span{span},
-			true)
->>>>>>> 4f7c0b96 (kv/client: add global grpc connection pool (#2511))
+			replicaInfo.StartTs, []regionspan.Span{span}, true)
 		go func() {
 			err := plr.Run(ctx)
 			if errors.Cause(err) != context.Canceled {