fix rebase

Signed-off-by: wangxiaoxuan273 <wangxiaoxuan119@gmail.com>

internal/contentutil/reference.go

@@ -15,18 +15,10 @@ limitations under the License.
 
 package contentutil
 
-import (
-	"github.com/opencontainers/go-digest"
-	"oras.land/oras-go/v2/registry"
-)
+import "github.com/opencontainers/go-digest"
 
 // IsDigest checks if the given string is a valid digest.
 func IsDigest(tagOrDigest string) bool {
 	_, err := digest.Parse(tagOrDigest)
 	return err == nil
 }
-
-// IsValidTag checks if the given string is a valid tag.
-func IsValidTag(tag string) bool {
-	return registry.Reference{Reference: tag}.ValidateReferenceAsTag() == nil
-}

internal/descriptor/descriptor.go

@@ -22,10 +22,7 @@ import (
 )
 
 // IsManifest checks if a descriptor describes a manifest.
-<<<<<<< HEAD
 // Adapted from `oras-go`: https://github.com/oras-project/oras-go/blob/d6c837e439f4c567f8003eab6e423c22900452a8/internal/descriptor/descriptor.go#L67
-=======
->>>>>>> 704e455 (rebase)
 func IsManifest(desc ocispec.Descriptor) bool {
 	switch desc.MediaType {
 	case docker.MediaTypeManifest,