Fix conflicts

Signed-off-by: Rohit Nayak <[email protected]>
vitessio · Feb 12, 2025 · 0b7a63d · 0b7a63d
1 parent e8e3414
commit 0b7a63d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go b/go/vt/vttablet/tabletmanager/vreplication/vcopier_atomic.go
@@ -85,16 +85,12 @@ func (vc *vcopier) copyAll(ctx context.Context, settings binlogplayer.VRSettings
 	rowsCopiedTicker := time.NewTicker(rowsCopiedUpdateInterval)
 	defer rowsCopiedTicker.Stop()
 
-<<<<<<< HEAD
 	parallelism := getInsertParallelism()
-=======
-	parallelism := int(math.Max(1, float64(vc.vr.workflowConfig.ParallelInsertWorkers)))
 	// For now do not support concurrent inserts for atomic copies.
 	if parallelism > 1 {
 		parallelism = 1
 		log.Infof("Disabling concurrent inserts for atomic copies")
 	}
->>>>>>> c47f1bd6cb (Atomic Copy: Fix panics when the copy phase starts in some clusters (#17717))
 	copyWorkerFactory := vc.newCopyWorkerFactory(parallelism)
 	var copyWorkQueue *vcopierCopyWorkQueue