minor fix

Signed-off-by: disksing <i@disksing.com>
oh-my-tidb · May 8, 2024 · 8a072ba · 8a072ba
1 parent 0260787
commit 8a072ba
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/client/resource_group/controller/controller.go b/client/resource_group/controller/controller.go
@@ -117,7 +117,6 @@ func WithWaitRetryTimes(times int) ResourceControlCreateOption {
 	}
 }
 
-<<<<<<< HEAD
 // WithDegradedModeWaitDuration is the option to set the wait duration for degraded mode.
 func WithDegradedModeWaitDuration(d time.Duration) ResourceControlCreateOption {
 	return func(controller *ResourceGroupsController) {