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)
commit884b3709a3bc890f9e93670d23a29fa93f765161
tree622c140c7975c8f8de091a21bdc14558d38e108b
parentd6e0a57c9f1b5d01db5f2c695b8224f71640120e
parentd9fa4aea5b103f65e914874529acef9979e51753
Merge pull request dotnet/core-setup#3363 from weshaggard/FixMergeIssues

Fix some merge issues from the recent infra work

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