maxmustermann/dotnet-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #144 from dotnet/stephentoub-patch-1

Browse source 
Fix merge error in release notes
This commit is contained in:
Lee Coward 2016-06-26 13:05:12 -07:00 committed by GitHub
parent 5d11300d28 4928d05896
commit 5dc69b89c7
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
release-notes/1.0/Release-Notes-1.0.0.md
View file

@ -81,11 +81,8 @@ New .NET Core APIs
### CLI
<<<<<<< HEAD
* Offline support: now you don't have to be connected to the internet to write applications that target only the .NET Core runtime and libraries. This means the core libraries are cached locally after running various dotnet commands the first time. Restoring packages which are not part of the Shared Framework do generally require and do need an internet connection to gather the packages from NuGet.
=======
* Offline support: now you don't have to be connected to the internet to write applications that target only the .NET Core runtime and libraries. This means the core libraries are cached locally after running various dotnet commands the first time. Restoring packages which are not part of the Shared Framework do generally require and internet connection to gather the packages from NuGet.
>>>>>>> master
* Offline support: now you don't have to be connected to the internet to write applications that target only the .NET Core runtime and libraries. This means the core libraries are cached locally after running various dotnet commands the first time. Restoring packages which are not part of the Shared Framework do generally require an internet connection to gather the packages from NuGet.
* New Templates: web, lib and xunittest
### WCF
@ -104,4 +101,4 @@ The lists of issues closed for this and past releases can be found here:
The lists of commits for this release can be viewed here:
* [CLR commits](https://github.com/dotnet/coreclr/commits/release/1.0.0)
* [BCL commits](https://github.com/dotnet/corefx/commits/release/1.0.0)
* [BCL commits](https://github.com/dotnet/corefx/commits/release/1.0.0)