fix ut

pingcap · Jan 25, 2024 · 61a6861 · 61a6861
1 parent 55119a7
commit 61a6861
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pkg/config/config_test_data.go b/pkg/config/config_test_data.go
@@ -21,11 +21,7 @@ const (
   "force-replicate": true,
   "check-gc-safe-point": true,
   "enable-sync-point": false,
-<<<<<<< HEAD
-=======
   "enable-table-monitor": false,
-  "bdr-mode": false,
->>>>>>> 8fc0bff9c (Update metrics.go)
   "sync-point-interval": 600000000000,
   "sync-point-retention": 86400000000000,
   "filter": {