resolve conflict

pingcap · Nov 23, 2023 · d4c6563 · d4c6563
1 parent 2aea734
commit d4c6563
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/cdc/owner/ddl_manager.go b/cdc/owner/ddl_manager.go
@@ -202,7 +202,6 @@ func (m *ddlManager) tick(
 	checkpointTs model.Ts,
 	tableCheckpoint map[model.TableName]model.Ts,
 ) ([]model.TableID, *schedulepb.BarrierWithMinTs, error) {
-
 	if m.needSendBootstrapEvent {
 		ok, err := m.checkAndBootstrap(ctx)
 		if err != nil {