Update assembly-conflict-resolution.md
authorSteve Harter <steveharter@users.noreply.github.com>
Fri, 9 Feb 2018 00:29:50 +0000 (18:29 -0600)
committerGitHub <noreply@github.com>
Fri, 9 Feb 2018 00:29:50 +0000 (18:29 -0600)
commitcde73d9e72ec72f1c034c2f39abd33505724238b
tree874eaf5866018b36517b17c17e5555601c1128fa
parenta30651eb71bd3f1899e868f60191ec3534d9f9e9
Update assembly-conflict-resolution.md

Commit migrated from https://github.com/dotnet/core-setup/commit/0568c193dd46b16e113772c7f8e5d076999a8c51
docs/installer/design-docs/assembly-conflict-resolution.md