Resolved merge conflict

Signed-off-by: Fredrik Skogman <[email protected]>
sigstore · Jan 29, 2024 · 8297aeb · 8297aeb
1 parent 3e2ab65
commit 8297aeb
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/examples/oci-image-verification/main.go b/examples/oci-image-verification/main.go
@@ -145,10 +145,7 @@ func run() error {
 	var trustedRootJSON []byte
 
 	if *tufRootURL != "" {
-		opts, err := tuf.DefaultOptions()
-		if err != nil {
-			return err
-		}
+		opts := tuf.DefaultOptions()
 		opts.RepositoryBaseURL = *tufRootURL
 		client, err := tuf.New(opts)
 		if err != nil {