projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6e0a57 d9fa4ae)
Merge pull request dotnet/core-setup#3363 from weshaggard/FixMergeIssues
authorWes Haggard <weshaggard@users.noreply.github.com>
Mon, 30 Oct 2017 17:23:33 +0000 (10:23 -0700)
committerGitHub <noreply@github.com>
Mon, 30 Oct 2017 17:23:33 +0000 (10:23 -0700)
Fix some merge issues from the recent infra work

Commit migrated from https://github.com/dotnet/core-setup/commit/f51b7195c79868d69d1bafcb7a8788c884930d1b


Trivial merge
Domain: Dotnet / Core;