Preston_PLB
/
oauth2
forked from Mirrors/oauth2
1
0
Fork 0
Code Pull Requests Activity

chore: merge/resolve conflict

This commit is contained in:
Guillaume Blaquiere 2021-10-08 21:04:48 +02:00
parent 742a68cda0
commit f0768b273c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
google/google.go
View File

@ -201,7 +201,7 @@ func (f *credentialsFile) tokenSource(ctx context.Context, params CredentialsPar
Ts: oauth2.ReuseTokenSource(nil, ts), Ts: oauth2.ReuseTokenSource(nil, ts),
Delegates: f.Delegates, Delegates: f.Delegates,
} }
return oauth2.ReuseTokenSource(nil, imp), nil return imp, nil
case "": case "":
return nil, errors.New("missing 'type' field in credentials") return nil, errors.New("missing 'type' field in credentials")
default: default: