chore: merge/resolve conflict

2021-10-08 21:04:48 +02:00 · 2021-10-08 21:04:48 +02:00 · f0768b273c
parent 742a68cda0
commit f0768b273c
1 changed files with 1 additions and 1 deletions
--- a/google/google.go
+++ b/google/google.go
@ -201,7 +201,7 @@ func (f *credentialsFile) tokenSource(ctx context.Context, params CredentialsPar
 			Ts:        oauth2.ReuseTokenSource(nil, ts),
 			Delegates: f.Delegates,
 		}
-		return oauth2.ReuseTokenSource(nil, imp), nil
+		return imp, nil
 	case "":
 		return nil, errors.New("missing 'type' field in credentials")
 	default: