fix

Signed-off-by: nolouch <[email protected]>

client/go.mod

@@ -28,16 +28,10 @@ require (
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-<<<<<<< HEAD
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.26.0 // indirect
 	github.com/prometheus/procfs v0.6.0 // indirect
-=======
-	github.com/prometheus/client_model v0.5.0 // indirect
-	github.com/prometheus/common v0.46.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
->>>>>>> 85d650bf6 (controller: fix the low_ru request missed (#8368))
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/sys v0.13.0 // indirect

client/resource_group/controller/limiter_test.go

@@ -166,14 +166,8 @@ func TestCancel(t *testing.T) {
 	checkTokens(re, lim1, t2, 7)
 	checkTokens(re, lim2, t2, 2)
 	d, err := WaitReservations(ctx, t2, []*Reservation{r1, r2})
-<<<<<<< HEAD
-	re.Equal(d, 4*time.Second)
-	re.Error(err)
-=======
 	re.Error(err)
 	re.Equal(4*time.Second, d)
-	re.Contains(err.Error(), "estimated wait time 4s, ltb state is 1.00:-4.00")
->>>>>>> 85d650bf6 (controller: fix the low_ru request missed (#8368))
 	checkTokens(re, lim1, t3, 13)
 	checkTokens(re, lim2, t3, 3)
 	cancel1()