Skip to content
This repository was archived by the owner on Nov 22, 2018. It is now read-only.

[automated] Merge branch 'release/2.2' => 'master' #184

Merged

Conversation

dotnet-maestro-bot
Copy link

I detected changes in the release/2.2 branch which have not been merged yet to master.
I'm a robot and am configured to help you automatically keep master up to date, so
I've opened this PR.

This PR merges commits made on release/2.2 by the following committers:

Instructions for merging

This PR will not be auto-merged. When pull request checks pass, please complete this PR
by creating a merge commit, not a squash or rebase commit.

merge button instructions

You can also do this on command line:

git checkout master
git pull
git fetch --force https://github.com/dotnet-maestro-bot/CORS merge/release/2.2-to-master:merge/release/2.2-to-master
git merge merge/release/2.2-to-master
git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging.
You can do this using GitHub
or using the command line.

Maintainers of this repo have permission to the branch 'merge/release/2.2-to-master' on https://github.com/dotnet-maestro-bot/CORS.
You can push changes to this branch to resolve conflicts or other issues in this pull request. The bot will attempt
to update this branch as more changes are discovered on release/2.2.

Please contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

@pranavkm pranavkm self-requested a review October 8, 2018 20:43
@pranavkm pranavkm merged commit d2771a0 into aspnet:master Oct 8, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants