resolve the conflicts

Signed-off-by: Ryan Leung <[email protected]>
ti-chi-bot · Feb 6, 2024 · 332f767 · 332f767
1 parent fce748e
commit 332f767
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/server/grpc_service.go b/server/grpc_service.go
@@ -1917,20 +1917,7 @@ func (s *GrpcServer) WatchGlobalConfig(req *pdpb.WatchGlobalConfigRequest, serve
 	if s.client == nil {
 		return ErrEtcdNotStarted
 	}
-<<<<<<< HEAD
-	ctx, cancel := context.WithCancel(s.Context())
-=======
-	if s.GetServiceMiddlewarePersistOptions().IsGRPCRateLimitEnabled() {
-		fName := currentFunction()
-		limiter := s.GetGRPCRateLimiter()
-		if done, err := limiter.Allow(fName); err == nil {
-			defer done()
-		} else {
-			return err
-		}
-	}
 	ctx, cancel := context.WithCancel(server.Context())
->>>>>>> 37be34ef1 (*: fix context usage when watch etcd (#7806))
 	defer cancel()
 	configPath := req.GetConfigPath()
 	if configPath == "" {