Update assembly-conflict-resolution.md
authorSteve Harter <steveharter@users.noreply.github.com>
Fri, 9 Feb 2018 15:34:02 +0000 (09:34 -0600)
committerGitHub <noreply@github.com>
Fri, 9 Feb 2018 15:34:02 +0000 (09:34 -0600)
commit74b6d259a1e2622b5dad5fb45b9e2cc14a3e4970
treee39681620fdc695ad7c4f8039f4e3a496be5b483
parent3e8e7f7ddf98830e6efdf2b2e5edfc8760ad570d
Update assembly-conflict-resolution.md

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