fix merge conflict in build-test.sh (dotnet/coreclr#19744)
authorSergey Andreenko <seandree@microsoft.com>
Thu, 30 Aug 2018 02:54:42 +0000 (19:54 -0700)
committerGitHub <noreply@github.com>
Thu, 30 Aug 2018 02:54:42 +0000 (19:54 -0700)
commit675f55150632c806835241a31a2da8b351ffec9f
tree8da5f38c26748e88deb406a3a97361d5df71da09
parentc5cbb9bd4f4eb556542cf2c8e8f7bf9f7a58084a
fix merge conflict in build-test.sh (dotnet/coreclr#19744)

Commit migrated from https://github.com/dotnet/coreclr/commit/d42cdd01992aa5328320c7d4bf5eca41fbc8ff02
src/coreclr/build-test.sh