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

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