fix conflict

Signed-off-by: zwwhdls <zwwhdls@hotmail.com>

internal/experimental/registry/client.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"net/http"
 	"sort"
 
 	auth "github.com/deislabs/oras/pkg/auth/docker"
@@ -69,7 +70,7 @@ func NewClient(opts ...ClientOption) (*Client, error) {
 		}
 	}
 	if client.resolver == nil {
-		resolver, err := client.authorizer.Resolver(context.Background())
+		resolver, err := client.authorizer.Resolver(context.Background(), http.DefaultClient, false)
 		if err != nil {
 			return nil, err
 		}

pkg/action/action_test.go

@@ -19,6 +19,7 @@ import (
 	"context"
 	"flag"
 	"io/ioutil"
+	"net/http"
 	"path/filepath"
 	"testing"
 
@@ -45,7 +46,7 @@ func actionConfigFixture(t *testing.T) *Configuration {
 		t.Fatal(err)
 	}
 
-	resolver, err := client.Resolver(context.Background())
+	resolver, err := client.Resolver(context.Background(), http.DefaultClient, false)
 	if err != nil {
 		t.Fatal(err)
 	}