Update assembly-conflict-resolution.md
authorSteve Harter <steveharter@users.noreply.github.com>
Tue, 20 Feb 2018 21:19:52 +0000 (15:19 -0600)
committerGitHub <noreply@github.com>
Tue, 20 Feb 2018 21:19:52 +0000 (15:19 -0600)
commit3da6b89dab8eea8190c1e8e4ffc27b3acda7216c
tree1a6a7c9a87cbcbc5090001b8af5d6ce9173d3242
parent0c19c78ee39f04be89b12681fedd5e412bc7c1a7
Update assembly-conflict-resolution.md

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