solve conflict

Signed-off-by: bufferflies <1045931706@qq.com>

pkg/swaggerserver/swaggerserver.go

@@ -21,12 +21,8 @@ import (
 	"context"
 	"net/http"
 
-<<<<<<< HEAD
-=======
 	httpSwagger "github.com/swaggo/http-swagger"
 	_ "github.com/tikv/pd/docs/swagger"
-	"github.com/tikv/pd/pkg/utils/apiutil"
->>>>>>> c07c333b3 (swagger: block swagger url if disbale swagger server  (#6785))
 	"github.com/tikv/pd/server"
 )
 

pkg/swaggerserver/swaggerserver_disable.go

@@ -21,23 +21,15 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/tikv/pd/pkg/utils/apiutil"
 	"github.com/tikv/pd/server"
 )
 
-<<<<<<< HEAD:pkg/swaggerserver/empty_handler.go
-func handler() http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		_, _ = io.WriteString(w, "Swagger UI is not built. Try `make` without `SWAGGER=1`.\n")
-	})
-=======
 // Enabled return false if swagger server is disabled.
 func Enabled() bool {
 	return false
 }
 
 // NewHandler creates a HTTP handler for Swagger.
-func NewHandler(context.Context, *server.Server) (http.Handler, apiutil.APIServiceGroup, error) {
-	return nil, apiutil.APIServiceGroup{}, nil
->>>>>>> c07c333b3 (swagger: block swagger url if disbale swagger server  (#6785)):pkg/swaggerserver/swaggerserver_disable.go
+func NewHandler(context.Context, *server.Server) (http.Handler, server.ServiceGroup, error) {
+	return nil, server.ServiceGroup{}, nil
 }