fix conflict

Signed-off-by: okJiang <[email protected]>
ti-chi-bot · Jul 29, 2024 · a16831e · a16831e
1 parent 876cbac
commit a16831e
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/tools/pd-ctl/pdctl/command/global.go b/tools/pd-ctl/pdctl/command/global.go
@@ -108,12 +108,7 @@ var dialClient = &http.Client{
 	Transport: apiutil.NewCallerIDRoundTripper(http.DefaultTransport, pdControlCallerID),
 }
 
-<<<<<<< HEAD
-// RequireHTTPSClient creates a HTTPS client if the related flags are set
-func RequireHTTPSClient(cmd *cobra.Command, args []string) error {
-=======
 func parseTLSConfig(cmd *cobra.Command) (*tls.Config, error) {
->>>>>>> d44d7212b (ctl: fix https client panic (#8239))
 	caPath, err := cmd.Flags().GetString("cacert")
 	if err != nil || len(caPath) == 0 {
 		return nil, err