resolve conflicts

Signed-off-by: disksing <[email protected]>
tikv · Feb 1, 2024 · 0932fdf · 0932fdf
1 parent d8cee91
commit 0932fdf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/server/replication/replication_mode_test.go b/server/replication/replication_mode_test.go
@@ -712,7 +712,7 @@ func TestComplexPlacementRules3(t *testing.T) {
 		DR:               "zone2",
 		WaitStoreTimeout: typeutil.Duration{Duration: time.Minute},
 	}}
-	cluster := mockcluster.NewCluster(ctx, config.NewTestOptions())
+	cluster := mockcluster.NewCluster(ctx, mockconfig.NewTestOptions())
 	replicator := newMockReplicator([]uint64{1})
 	rep, err := NewReplicationModeManager(conf, store, cluster, replicator)
 	re.NoError(err)