fix merge conflict in build-test.sh (#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)
commitd42cdd01992aa5328320c7d4bf5eca41fbc8ff02
tree7f7263f94085be29aea64bcd481da59ec277bac1
parent398caa5c90173f90bcfc8275670a1fcaa7ad6e41
fix merge conflict in build-test.sh (#19744)
build-test.sh