fix conflict

pull/1/head
Marc CHEVALDONNE 6 years ago
commit 51aaac2692

@ -2,6 +2,11 @@
## Tools to install
### if you want to run .NET Core 3.1.100 (recommended)
* .NET Core 3.1.100 installer: https://dotnet.microsoft.com/download
* direct link for windows: https://download.visualstudio.microsoft.com/download/pr/639f7cfa-84f8-48e8-b6c9-82634314e28f/8eb04e1b5f34df0c840c1bffa363c101/dotnet-sdk-3.1.100-win-x64.exe
* direct link for maxosx: https://download.visualstudio.microsoft.com/download/pr/787e81f1-f0da-4e3b-a989-8a199132ed8c/61a8dba81fbf2b3d533562d7b96443ec/dotnet-sdk-3.1.100-osx-x64.pkg
### if you want to run .NET Core 3.0
* .NET Core 3.0.1: https://dotnet.microsoft.com/download/dotnet-core/3.0
* direct link to SDK:

Loading…
Cancel
Save