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

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