From b52a39a84ecd5ec94d98ab424e989a9f0df8936a Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Fri, 1 May 2020 13:00:53 +0100 Subject: [PATCH] drive: fix merge breakage In 2f5a2d3c48ba4b0c an incorrect merge caused compilation to fail --- backend/drive/drive.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/drive/drive.go b/backend/drive/drive.go index 5ac8f3f7e..376d03b53 100755 --- a/backend/drive/drive.go +++ b/backend/drive/drive.go @@ -1790,7 +1790,7 @@ func (f *Fs) ListR(ctx context.Context, dir string, callback fs.ListRCallback) ( // itemToDirEntry converts a drive.File to a fs.DirEntry. // When the drive.File cannot be represented as a fs.DirEntry // (nil, nil) is returned. -func (f *Fs) itemToDirEntry(remote string, item *drive.File) (fs.DirEntry, error) { +func (f *Fs) itemToDirEntry(remote string, item *drive.File) (entry fs.DirEntry, err error) { switch { case item.MimeType == driveFolderType: // cache the directory ID for later lookups