Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master to fsharp5 #6490

Merged
2 commits merged into from
Apr 11, 2019
Merged

Merge master to fsharp5 #6490

2 commits merged into from
Apr 11, 2019

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from master into fsharp5.

git fetch --all
git checkout merges/master-to-fsharp5
git reset --hard upstream/fsharp5
git merge upstream/master
# Fix merge conflicts
git commit
git push upstream merges/master-to-fsharp5 --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

brettfo added 2 commits April 10, 2019 12:09
* upgrade System.Memory package

* don't update restore sources during offline build

* update MSBuild packages
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approval

@ghost ghost merged commit 0a45017 into fsharp5 Apr 11, 2019
@ghost ghost deleted the merges/master-to-fsharp5 branch April 11, 2019 03:30
@dotnet-bot dotnet-bot restored the merges/master-to-fsharp5 branch April 11, 2019 12:02
@dotnet-bot dotnet-bot deleted the merges/master-to-fsharp5 branch April 11, 2019 12:02
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants