fix the conflicts

Signed-off-by: Leavrth <jianjun.liao@outlook.com>
pingcap · Jan 18, 2023 · 4be848c · 4be848c
1 parent ed24408
commit 4be848c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/br/pkg/checkpoint/checkpoint.go b/br/pkg/checkpoint/checkpoint.go
@@ -413,14 +413,10 @@ func (r *CheckpointRunner) startCheckpointLoop(ctx context.Context, tickDuration
 		defer cancel()
 		var wg sync.WaitGroup
 		errCh := r.startCheckpointRunner(cctx, &wg)
-<<<<<<< HEAD
-		ticker := time.NewTicker(tickDuration)
-=======
 		flushTicker := time.NewTicker(tickDurationForFlush)
 		defer flushTicker.Stop()
 		lockTicker := time.NewTicker(tickDurationForLock)
 		defer lockTicker.Stop()
->>>>>>> 89de573660 (BR: add lock with ttl for checkpoint backup (#40563))
 		for {
 			select {
 			case <-ctx.Done():