resolve merge conflict

This commit is contained in:
Lee Coward 2017-01-27 10:48:58 -08:00
parent a2faf11bb2
commit fefeddcdaf

View file

@ -40,7 +40,7 @@ The first step is to establish the source feed for the package manager. This is
sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
sudo apt-get update
sudo apt-get install dotnet-dev-1.0.0-preview4-004530
sudo apt-get install dotnet-dev-1.0.0-rc3-004530
```