mirror of
https://github.com/project-zot/zot.git
synced 2026-06-18 13:37:57 +08:00
resolve merge conflicts
This commit is contained in:
Vendored
+3
-1
@@ -395,9 +395,11 @@ func (d *BoltDBDriver) DeleteBlob(digest godigest.Digest, path string) error {
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
return nil
|
||||
return zerr.ErrCacheMiss
|
||||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user