Update assembly-conflict-resolution.md
authorSteve Harter <steveharter@users.noreply.github.com>
Fri, 9 Feb 2018 00:34:47 +0000 (18:34 -0600)
committerGitHub <noreply@github.com>
Fri, 9 Feb 2018 00:34:47 +0000 (18:34 -0600)
commit3e8e7f7ddf98830e6efdf2b2e5edfc8760ad570d
tree9ad1fa5d9a7af6e4ac86d7d909481374e4957572
parentcde73d9e72ec72f1c034c2f39abd33505724238b
Update assembly-conflict-resolution.md

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